From 571bcd4662a351cfa55bbf1a79ed1bc26da5780f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 15 Nov 2013 09:08:58 +0100 Subject: [PATCH] common: Fix build problem with Sun Studio compiler. * common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy functions. (ESTREAM_MUTEX_INITIALIZE): Ditto. -- GnuPG-bug-id: 1566 Signed-off-by: Werner Koch --- common/estream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/estream.c b/common/estream.c index 35b2af047..86d8e21f4 100644 --- a/common/estream.c +++ b/common/estream.c @@ -181,13 +181,13 @@ static int estream_pth_killed; (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \ : (void)pth_mutex_acquire (&(mutex), 0, NULL)) # define ESTREAM_MUTEX_UNLOCK(mutex) \ - (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \ + (estream_pth_killed ? dummy_mutex_call_int ((mutex)) \ : pth_mutex_release (&(mutex))) # define ESTREAM_MUTEX_TRYLOCK(mutex) \ (estream_pth_killed ? dummy_mutex_call_int ((mutex)) \ : ((pth_mutex_acquire (&(mutex), 1, NULL) == TRUE)? 0:-1)) # define ESTREAM_MUTEX_INITIALIZE(mutex) \ - (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \ + (estream_pth_killed ? dummy_mutex_call_int ((mutex)) \ : pth_mutex_init (&(mutex))) #else /*!HAVE_PTH*/