[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.22-11-g571bcd4

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  571bcd4662a351cfa55bbf1a79ed1bc26da5780f (commit)
      from  f72d9a5cf69c3e719979547a5f7a37efe49bd642 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 571bcd4662a351cfa55bbf1a79ed1bc26da5780f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 15 09:08:58 2013 +0100

    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 <wk at gnupg.org>

diff --git a/common/estream.c b/common/estream.c
index 35b2af0..86d8e21 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*/

-----------------------------------------------------------------------

Summary of changes:
 common/estream.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org