diff options
| author | Werner Koch <[email protected]> | 2015-08-25 19:04:15 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-08-25 19:04:15 +0000 |
| commit | 3f53d3d5d9e73a053b1e89073ef8f7cf01bfc8e6 (patch) | |
| tree | 9f498f7b6d7f55c5ff504aa0302b97908e2a9637 | |
| parent | Add configure option --enable-build-timestamp. (diff) | |
| download | gpgme-3f53d3d5d9e73a053b1e89073ef8f7cf01bfc8e6.tar.gz gpgme-3f53d3d5d9e73a053b1e89073ef8f7cf01bfc8e6.zip | |
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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | src/gpgme.h.in | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/gpgme.h.in b/src/gpgme.h.in index 88766465..a0d9d31b 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 |