2003-09-14 Marcus Brinkmann <marcus@g10code.de>

* gpgme.h: Define macro _GPGME_INLINE depending on the compiler
	characteristics and use that instead __inline__.
This commit is contained in:
Marcus Brinkmann 2003-09-14 00:06:22 +00:00
parent 256ef2e87e
commit 36e27200b7
2 changed files with 15 additions and 4 deletions

View File

@ -1,5 +1,8 @@
2003-09-14 Marcus Brinkmann <marcus@g10code.de> 2003-09-14 Marcus Brinkmann <marcus@g10code.de>
* gpgme.h: Define macro _GPGME_INLINE depending on the compiler
characteristics and use that instead __inline__.
* context.h (struct gpgme_context): New members lc_ctype and * context.h (struct gpgme_context): New members lc_ctype and
lc_messages. lc_messages.
* gpgme.c: Include <locale.h>. * gpgme.c: Include <locale.h>.

View File

@ -21,6 +21,14 @@
#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>
@ -85,7 +93,7 @@ typedef gpg_err_code_t gpgme_err_code_t;
typedef gpg_err_source_t gpgme_err_source_t; typedef gpg_err_source_t gpgme_err_source_t;
static __inline__ gpgme_error_t static _GPGME_INLINE gpgme_error_t
gpgme_err_make (gpgme_err_source_t source, gpgme_err_code_t code) gpgme_err_make (gpgme_err_source_t source, gpgme_err_code_t code)
{ {
return gpg_err_make (source, code); return gpg_err_make (source, code);
@ -98,21 +106,21 @@ gpgme_err_make (gpgme_err_source_t source, gpgme_err_code_t code)
#define GPGME_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_USER_1 #define GPGME_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_USER_1
#endif #endif
static __inline__ gpgme_error_t static _GPGME_INLINE gpgme_error_t
gpgme_error (gpgme_err_code_t code) gpgme_error (gpgme_err_code_t code)
{ {
return gpgme_err_make (GPGME_ERR_SOURCE_DEFAULT, code); return gpgme_err_make (GPGME_ERR_SOURCE_DEFAULT, code);
} }
static __inline__ gpgme_err_code_t static _GPGME_INLINE gpgme_err_code_t
gpgme_err_code (gpgme_error_t err) gpgme_err_code (gpgme_error_t err)
{ {
return gpg_err_code (err); return gpg_err_code (err);
} }
static __inline__ gpgme_err_source_t static _GPGME_INLINE gpgme_err_source_t
gpgme_err_source (gpgme_error_t err) gpgme_err_source (gpgme_error_t err)
{ {
return gpg_err_source (err); return gpg_err_source (err);