[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-4-g1731ed8

[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  1731ed88491559aca395bc0596cdc0ee3ea1fa3e (commit)
       via  3656aa9343c01a735b1a28a7e067e4cbb1bb1608 (commit)
      from  295c43bc361b1faa840668c9dab73e4772d31fb1 (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 1731ed88491559aca395bc0596cdc0ee3ea1fa3e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 30 15:29:35 2012 +0200

    Cast second value of a ?: to void in estream.c.
    
    * common/estream.c (ESTREAM_MUTEX_LOCK): Cast pth_mutex_acquire result
    to void.  Some compilers choke on mixing void and int in an
    conditional operator.  Reported by Nelson H. F. Beebe.

diff --git a/common/estream.c b/common/estream.c
index 2d68415..3b6139e 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -176,7 +176,7 @@ static int estream_pth_killed;
 # define ESTREAM_MUTEX_INITIALIZER PTH_MUTEX_INIT
 # define ESTREAM_MUTEX_LOCK(mutex)                              \
   (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
-   : pth_mutex_acquire (&(mutex), 0, NULL))
+   : (void)pth_mutex_acquire (&(mutex), 0, NULL))
 # define ESTREAM_MUTEX_UNLOCK(mutex)                            \
   (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
    : pth_mutex_release (&(mutex)))

commit 3656aa9343c01a735b1a28a7e067e4cbb1bb1608
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 30 15:21:30 2012 +0200

    Fix --with-pth-prefix help string.
    
    --

diff --git a/m4/gnupg-pth.m4 b/m4/gnupg-pth.m4
index 6dc9e0e..712d6e8 100644
--- a/m4/gnupg-pth.m4
+++ b/m4/gnupg-pth.m4
@@ -11,7 +11,7 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
 # GNUPG_PTH_VERSION_CHECK(REQUIRED)
-# 
+#
 # If the version is sufficient, HAVE_PTH will be set to yes.
 #
 # Taken and modified from the m4 macros which come with Pth.
@@ -69,7 +69,7 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
        AC_MSG_RESULT($gnupg_cv_pth_is_sane)
     else
        AC_MSG_RESULT(no)
-    fi    
+    fi
   ])
 
 
@@ -82,7 +82,7 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
 AC_DEFUN([GNUPG_PATH_PTH],
 [ AC_ARG_WITH(pth-prefix,
              AC_HELP_STRING([--with-pth-prefix=PFX],
-                           [prefix where GNU Pth is installed (optional)]),
+                           [prefix where GNU Pth is installed]),
      pth_config_prefix="$withval", pth_config_prefix="")
   if test x$pth_config_prefix != x ; then
      PTH_CONFIG="$pth_config_prefix/bin/pth-config"
@@ -91,7 +91,7 @@ AC_DEFUN([GNUPG_PATH_PTH],
   tmp=ifelse([$1], ,1.3.7,$1)
   if test "$PTH_CONFIG" != "no"; then
     GNUPG_PTH_VERSION_CHECK($tmp)
-    if test $have_pth = yes; then      
+    if test $have_pth = yes; then
        PTH_CFLAGS=`$PTH_CONFIG --cflags`
        PTH_LIBS=`$PTH_CONFIG --ldflags`
        PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"

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

Summary of changes:
 common/estream.c |    2 +-
 m4/gnupg-pth.m4  |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


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