[git] GnuPG - branch, master, updated. gnupg-2.1.0-29-gcd2c6f3

[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, master has been updated
       via  cd2c6f36fe5d1d1d45546f5168aead5cbe6487e0 (commit)
      from  164a6a9dd4af26668dd0d01061688bf1ceff44bf (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 cd2c6f36fe5d1d1d45546f5168aead5cbe6487e0
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 19 10:34:32 2014 +0100

    Fix linker problem on OS X.
    
    * common/init.c (default_errsource): Move to the .data segmemt.
    --
    
    See mails starting at
     http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029089.html

diff --git a/common/init.c b/common/init.c
index 1cbd709..2d5d630 100644
--- a/common/init.c
+++ b/common/init.c
@@ -67,8 +67,11 @@ static mem_cleanup_item_t mem_cleanup_list;
 
 /* The default error source of the application.  This is different
    from GPG_ERR_SOURCE_DEFAULT in that it does not depend on the
-   source file and thus is usable in code shared by applications.  */
-gpg_err_source_t default_errsource;
+   source file and thus is usable in code shared by applications.
+   Note that we need to initialize it because otherwise some linkers
+   (OS X at least) won't find the symbol when linking the t-*.c
+   files.  */
+gpg_err_source_t default_errsource = 0;
 
 
 #ifdef HAVE_W32CE_SYSTEM
@@ -145,7 +148,7 @@ writestring_via_estream (int mode, const char *string)
 void
 _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
 {
-  /* Store the error source in a gloabl variable. */
+  /* Store the error source in a global variable. */
   default_errsource = errsource;
 
   atexit (run_mem_cleanup);

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

Summary of changes:
 common/init.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


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