[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-6-g61ccd8d

[by Marcus Brinkmann]

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, master has been updated
       via  61ccd8d92d9d3b8ba0eca3c2969d7f6f37e16405 (commit)
      from  682df45d15661ed3544e2ed34bcb636200cc40f9 (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 61ccd8d92d9d3b8ba0eca3c2969d7f6f37e16405
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Tue Jan 3 16:50:52 2012 +0100

    Fix last change: Only set gcrypt thread callback for older versions.
    
    * dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to
    USE_GCRY_THREAD_CBS.

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index a72acd0..2256c59 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -281,10 +281,10 @@ static void handle_connections (assuan_fd_t listen_fd);
 ASSUAN_SYSTEM_PTH_IMPL;
 
 #if GCRY_THREAD_OPTION_VERSION == 0
-#define FIX_GCRY_PTH_INIT 1
+#define USE_GCRY_THREAD_CBS 1
 #endif
 
-#ifdef FIX_GCRY_PTH_INIT
+#ifdef USE_GCRY_THREAD_CBS
 GCRY_THREAD_OPTION_PTH_IMPL;
 static int fixed_gcry_pth_init (void)
 {
diff --git a/g13/g13.c b/g13/g13.c
index e38f211..bc05977 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -205,10 +205,10 @@ static void join_idle_task (void);
 ASSUAN_SYSTEM_PTH_IMPL;
 
 #if GCRY_THREAD_OPTION_VERSION == 0
-#define FIX_GCRY_PTH_INIT 1
+#define USE_GCRY_THREAD_CBS 1
 #endif
 
-#ifdef FIX_GCRY_PTH_INIT
+#ifdef USE_GCRY_THREAD_CBS
 GCRY_THREAD_OPTION_PTH_IMPL;
 static int fixed_gcry_pth_init (void)
 {

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

Summary of changes:
 dirmngr/dirmngr.c |    4 ++--
 g13/g13.c         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


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