GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid -Wundef warnings if gpgme.h is used by g++.

Browse Source 
* src/gpgme.h.in (_GPGME_INLINE): Move definition into the
extern-C-scope.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-08-25 21:04:15 +02:00
parent ff91e699f7
commit 3f53d3d5d9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gpgme.h.in
View File

@ -23,14 +23,6 @@
#ifndef GPGME_H #ifndef GPGME_H
#define 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 for the FILE type definition. */
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
@ -38,17 +30,40 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#if 0 /* just to make Emacs auto-indent happy */ #if 0 /*(Make Emacsen's auto-indent happy.)*/
} }
#endif #endif
#endif /* __cplusplus */ #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@ @INSERT__TYPEDEFS_FOR_GPGME_H@
/* /*
* Check for compiler features. * 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__ #if __GNUC__
#define _GPGME_GCC_VERSION (__GNUC__ * 10000 \ #define _GPGME_GCC_VERSION (__GNUC__ * 10000 \
@ -73,17 +88,6 @@ extern "C" {
#endif #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. */ /* Check for a matching _FILE_OFFSET_BITS definition. */
#if @NEED__FILE_OFFSET_BITS@ #if @NEED__FILE_OFFSET_BITS@
#ifndef _FILE_OFFSET_BITS #ifndef _FILE_OFFSET_BITS