Make use of GPGRT macros is available.
* src/gpgme.h.in (_GPGME_INLINE): Define using GPGRT_INLINE if possible. Fix problem with -Wundef by adding an extra "defined()". (_GPGME_GCC_VERSION): Define using GPGRT_ macro if possible.
This commit is contained in:
parent
3f53d3d5d9
commit
c4f4b5c0a6
@ -56,28 +56,33 @@ extern "C" {
|
|||||||
/*
|
/*
|
||||||
* Check for compiler features.
|
* Check for compiler features.
|
||||||
*/
|
*/
|
||||||
#ifdef __GNUC__
|
#ifdef GPGRT_INLINE
|
||||||
|
# define _GPGME_INLINE GPGRT_INLINE
|
||||||
|
#elif defined(__GNUC__)
|
||||||
# define _GPGME_INLINE __inline__
|
# define _GPGME_INLINE __inline__
|
||||||
#elif __STDC_VERSION__ >= 199901L
|
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
||||||
# define _GPGME_INLINE inline
|
# define _GPGME_INLINE inline
|
||||||
#else
|
#else
|
||||||
# define _GPGME_INLINE
|
# define _GPGME_INLINE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if __GNUC__
|
#ifdef GPGRT_ATTR_DEPRECATED
|
||||||
#define _GPGME_GCC_VERSION (__GNUC__ * 10000 \
|
# define _GPGME_DEPRECATED GPGRT_ATTR_DEPRECATED
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
# define _GPGME_GCC_VERSION (__GNUC__ * 10000 \
|
||||||
+ __GNUC_MINOR__ * 100 \
|
+ __GNUC_MINOR__ * 100 \
|
||||||
+ __GNUC_PATCHLEVEL__)
|
+ __GNUC_PATCHLEVEL__)
|
||||||
|
|
||||||
#if _GPGME_GCC_VERSION > 30100
|
# if _GPGME_GCC_VERSION > 30100
|
||||||
#define _GPGME_DEPRECATED __attribute__ ((__deprecated__))
|
# define _GPGME_DEPRECATED __attribute__ ((__deprecated__))
|
||||||
#endif
|
# else
|
||||||
|
# define _GPGME_DEPRECATED
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# define _GPGME_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _GPGME_DEPRECATED
|
|
||||||
#define _GPGME_DEPRECATED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The macro _GPGME_DEPRECATED_OUTSIDE_GPGME suppresses warnings for
|
/* The macro _GPGME_DEPRECATED_OUTSIDE_GPGME suppresses warnings for
|
||||||
fields we must access in GPGME for ABI compatibility. */
|
fields we must access in GPGME for ABI compatibility. */
|
||||||
|
Loading…
Reference in New Issue
Block a user