1 Changes needed to get GnuPG estream.c to compile with the Studio C compiler.

     2 

     3 These were legitimate bugs in GnuPG version 2.0.22, but looking at the

     4 latest version of estream.c in the GnuPG git repository, the problems have

     5 been resolved by redefining ESTREAM_MUTEX_UNLOCK and ESTREAM_MUTEX_INITIALIZE

     6 to no longer test against estream_pth_killed and therefore no need for the

     7 bogusly defined dummy routines.

     8 

     9 --- gnupg-2.0.22/common/estream.c.orig	2014-01-15 08:38:06.978672664 -0800

    10 +++ gnupg-2.0.22/common/estream.c	2014-01-15 09:02:39.386197974 -0800

    11 @@ -181,13 +181,13 @@

    12    (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \

    13     : (void)pth_mutex_acquire (&(mutex), 0, NULL))

    14  # define ESTREAM_MUTEX_UNLOCK(mutex)                            \

    15 -  (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \

    16 +  (estream_pth_killed ? dummy_mutex_call_int ((mutex))         \

    17     : pth_mutex_release (&(mutex)))

    18  # define ESTREAM_MUTEX_TRYLOCK(mutex)                                   \

    19    (estream_pth_killed ? dummy_mutex_call_int ((mutex))                  \

    20     : ((pth_mutex_acquire (&(mutex), 1, NULL) == TRUE)? 0:-1))

    21  # define ESTREAM_MUTEX_INITIALIZE(mutex)                        \

    22 -  (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \

    23 +  (estream_pth_killed ? dummy_mutex_call_int ((mutex))         \

    24     : pth_mutex_init (&(mutex)))

    25  

    26  #else /*!HAVE_PTH*/