diff options
| author | Werner Koch <wk@gnupg.org> | 2015-04-24 15:49:18 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-04-24 16:10:47 +0200 |
| commit | 26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3 (patch) | |
| tree | 3cec75e92b9af25ac5851cd02e9f610ff678a542 /common/mischelp.h | |
| parent | common: Remove two JNLIB_ macros (jnlib merge). (diff) | |
| download | gnupg2-26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3.tar.xz gnupg2-26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3.zip | |
common: Rename log and gcc attribute macros (jnlib merge).
* common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
* common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
--
JNLIB has no more meaning. Thus we switch to a GPGRT_ prefix in
anticipation that some code may eventually be moved to libgpg-error.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'common/mischelp.h')
| -rw-r--r-- | common/mischelp.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/common/mischelp.h b/common/mischelp.h index df009ad5e..940651f5e 100644 --- a/common/mischelp.h +++ b/common/mischelp.h @@ -48,25 +48,25 @@ time_t timegm (struct tm *tm); #define DIMof(type,member) DIM(((type *)0)->member) -#undef JNLIB_GCC_HAVE_PUSH_PRAGMA +#undef GPGRT_GCC_HAVE_PUSH_PRAGMA #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ) -# define JNLIB_GCC_M_FUNCTION 1 -# define JNLIB_GCC_A_NR __attribute__ ((noreturn)) +# define GPGRT_GCC_M_FUNCTION 1 /* __FUNCTION__ macro is available. */ +# define GPGRT_GCC_A_NR __attribute__ ((noreturn)) # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) -# define JNLIB_GCC_HAVE_PUSH_PRAGMA 1 -# define JNLIB_GCC_A_PRINTF( f, a ) \ +# define GPGRT_GCC_HAVE_PUSH_PRAGMA 1 +# define GPGRT_GCC_A_PRINTF( f, a ) \ __attribute__ ((format (__gnu_printf__,f,a))) -# define JNLIB_GCC_A_NR_PRINTF( f, a ) \ +# define GPGRT_GCC_A_NR_PRINTF( f, a ) \ __attribute__ ((noreturn, format (__gnu_printf__,f,a))) # else -# define JNLIB_GCC_A_PRINTF( f, a ) __attribute__ ((format (printf,f,a))) -# define JNLIB_GCC_A_NR_PRINTF( f, a ) \ +# define GPGRT_GCC_A_PRINTF( f, a ) __attribute__ ((format (printf,f,a))) +# define GPGRT_GCC_A_NR_PRINTF( f, a ) \ __attribute__ ((noreturn, format (printf,f,a))) # endif #else -# define JNLIB_GCC_A_NR -# define JNLIB_GCC_A_PRINTF( f, a ) -# define JNLIB_GCC_A_NR_PRINTF( f, a ) +# define GPGRT_GCC_A_NR +# define GPGRT_GCC_A_PRINTF( f, a ) +# define GPGRT_GCC_A_NR_PRINTF( f, a ) #endif |