[git] GPG-ERROR - branch, master, updated. libgpg-error-1.26-5-g704c319

[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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  704c31992e8716bbe61e6d5751e125a64badeef0 (commit)
       via  80ec003f328ee8180a63585d196a8d40e6045b39 (commit)
      from  8d844f6c23f6ca2192248f8d7eb7bf52b645b25b (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 704c31992e8716bbe61e6d5751e125a64badeef0
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 3 16:12:16 2017 +0100

    Fix macro GPGRT_GCC_VERSION
    
    * src/gpg-error.h.in (GPGRT_GCC_VERSION): Fix.
    --
    
    Fixes-commit: 4e790613f66efcfc62d73722d5f1730a37cb8324
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/NEWS b/NEWS
index b19fd11..572385f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Noteworthy changes in version 1.27 (unreleased) [C2_/A2_/R_]
 -----------------------------------------------
 
+ * Fixed macro GPGRT_GCC_VERSION.
+
 
 Noteworthy changes in version 1.26 (2016-12-21) [C21/A21/R0]
 -----------------------------------------------
diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
index 06c2f9c..c603314 100644
--- a/src/gpg-error.h.in
+++ b/src/gpg-error.h.in
@@ -155,7 +155,7 @@ typedef unsigned int gpg_error_t;
 # define _GPG_ERR_CONSTRUCTOR
 #endif
 
-#define GPGRT_GCC_VERSION  _GCC_ERR_GCC_VERSION
+#define GPGRT_GCC_VERSION  _GPG_ERR_GCC_VERSION
 
 #if _GPG_ERR_GCC_VERSION >= 29200
 # define _GPGRT__RESTRICT __restrict__

commit 80ec003f328ee8180a63585d196a8d40e6045b39
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 3 16:32:12 2017 +0100

    Fix last merge.
    
    --

diff --git a/NEWS b/NEWS
index 21637bc..b19fd11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
-Noteworthy changes in version 1.26 (unreleased) [C20/A20/R_]
+Noteworthy changes in version 1.27 (unreleased) [C2_/A2_/R_]
+-----------------------------------------------
+
+
+Noteworthy changes in version 1.26 (2016-12-21) [C21/A21/R0]
 -----------------------------------------------
 
  * New option --desc for gpg-error.
diff --git a/configure.ac b/configure.ac
index e3ca56e..6d4f173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.14"
 # another commit, and a push so that the git magic is able to work.
 # See below for the LT versions.
 m4_define([mym4_version_major], [1])
-m4_define([mym4_version_minor], [26])
+m4_define([mym4_version_minor], [27])
 
 # Below is m4 magic to extract and compute the revision number, the
 # decimalized short revision number, a beta version string, and a flag

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

Summary of changes:
 NEWS               | 8 +++++++-
 configure.ac       | 2 +-
 src/gpg-error.h.in | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org