diff options
| author | Werner Koch <[email protected]> | 2013-11-15 08:08:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-03-07 09:55:53 +0000 |
| commit | 0fc71f7277c6f833f838bbd384f1a22d0c333e8e (patch) | |
| tree | 37765f00bce750c7fae137343facaf71f7d0760d | |
| parent | gpg: Do not require a trustdb with --always-trust. (diff) | |
| download | gnupg-0fc71f7277c6f833f838bbd384f1a22d0c333e8e.tar.gz gnupg-0fc71f7277c6f833f838bbd384f1a22d0c333e8e.zip | |
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 <[email protected]>
(cherry picked from commit 571bcd4662a351cfa55bbf1a79ed1bc26da5780f)
Reolved conflicts:
common/estream.c
Warning: estream.c still uses pth_mutex_* which is definitely wrong.
Needs to be investigated.
| -rw-r--r-- | common/estream.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/common/estream.c b/common/estream.c index 79e3efbb1..9c15100f0 100644 --- a/common/estream.c +++ b/common/estream.c @@ -171,7 +171,8 @@ typedef pth_mutex_t estream_mutex_t; ((pth_mutex_acquire (&(mutex), 1, NULL) == TRUE) ? 0 : -1) # define ESTREAM_MUTEX_INITIALIZE(mutex) \ pth_mutex_init (&(mutex)) -#else + +#else /*!HAVE_NPTH*/ typedef void *estream_mutex_t; @@ -190,10 +191,11 @@ dummy_mutex_call_int (estream_mutex_t mutex) # define ESTREAM_MUTEX_INITIALIZER NULL # define ESTREAM_MUTEX_LOCK(mutex) dummy_mutex_call_void ((mutex)) -# define ESTREAM_MUTEX_UNLOCK(mutex) dummy_mutex_call_void ((mutex)) +# define ESTREAM_MUTEX_UNLOCK(mutex) dummy_mutex_call_int ((mutex)) # define ESTREAM_MUTEX_TRYLOCK(mutex) dummy_mutex_call_int ((mutex)) -# define ESTREAM_MUTEX_INITIALIZE(mutex) dummy_mutex_call_void ((mutex)) -#endif +# define ESTREAM_MUTEX_INITIALIZE(mutex) dummy_mutex_call_int ((mutex)) + +#endif /*!HAVE_NPTH*/ /* Primitive system I/O. */ |