[git] GPGME - branch, master, updated. gpgme-1.5.5-23-g3f53d3d

[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 "GnuPG Made Easy".

The branch, master has been updated
       via  3f53d3d5d9e73a053b1e89073ef8f7cf01bfc8e6 (commit)
      from  ff91e699f7c14ea6cbc27b487cb40e9f6bd58901 (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 3f53d3d5d9e73a053b1e89073ef8f7cf01bfc8e6
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 25 21:04:15 2015 +0200

    Avoid -Wundef warnings if gpgme.h is used by g++.
    
    * src/gpgme.h.in (_GPGME_INLINE): Move definition into the
    extern-C-scope.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 8876646..a0d9d31 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -23,14 +23,6 @@
 #ifndef GPGME_H
 #define GPGME_H
 
-#ifdef __GNUC__
-#define _GPGME_INLINE __inline__
-#elif __STDC_VERSION__ >= 199901L
-#define _GPGME_INLINE inline
-#else
-#define _GPGME_INLINE
-#endif
-
 /* Include stdio.h for the FILE type definition.  */
 #include <stdio.h>
 #include <time.h>
@@ -38,17 +30,40 @@
 
 #ifdef __cplusplus
 extern "C" {
-#if 0 /* just to make Emacs auto-indent happy */
+#if 0 /*(Make Emacsen's auto-indent happy.)*/
 }
 #endif
 #endif /* __cplusplus */
 
+
+/* The version of this header should match the one of the library.  Do
+   not use this symbol in your application, use gpgme_check_version
+   instead.  The purpose of this macro is to let autoconf (using the
+   AM_PATH_GPGME macro) check that this header matches the installed
+   library.  */
+#define GPGME_VERSION "@PACKAGE_VERSION@"
+
+/* The version number of this header.  It may be used to handle minor
+   API incompatibilities.  */
+#define GPGME_VERSION_NUMBER @VERSION_NUMBER@
+
+
+/* System specific typedefs.  */
 @INSERT__TYPEDEFS_FOR_GPGME_H@
 
+
 

 /*
  * Check for compiler features.
  */
+#ifdef __GNUC__
+# define _GPGME_INLINE __inline__
+#elif __STDC_VERSION__ >= 199901L
+# define _GPGME_INLINE inline
+#else
+# define _GPGME_INLINE
+#endif
+
 
 #if __GNUC__
 #define _GPGME_GCC_VERSION (__GNUC__ * 10000 \
@@ -73,17 +88,6 @@ extern "C" {
 #endif
 
 
-/* The version of this header should match the one of the library.  Do
-   not use this symbol in your application, use gpgme_check_version
-   instead.  The purpose of this macro is to let autoconf (using the
-   AM_PATH_GPGME macro) check that this header matches the installed
-   library.  */
-#define GPGME_VERSION "@PACKAGE_VERSION@"
-
-/* The version number of this header.  It may be used to handle minor
-   API incompatibilities.  */
-#define GPGME_VERSION_NUMBER @VERSION_NUMBER@
-
 /* Check for a matching _FILE_OFFSET_BITS definition.  */
 #if @NEED__FILE_OFFSET_BITS@
 #ifndef _FILE_OFFSET_BITS

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

Summary of changes:
 src/gpgme.h.in | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org