From 1c454aee81e38ffbc4a615092742ae4b1e37b57f Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 22 Jun 2009 14:50:17 +0000 Subject: 2009-06-22 Marcus Brinkmann * configure.ac: Add AC_TYPE_UINTPTR_T. * assuan/assuan.h [_ASSUAN_IN_GPGME_BUILD_ASSUAN]: Declare _gpgme_io_connect. src/ 2009-06-22 Marcus Brinkmann * debug.h: Everywhere, use %p instead of 0x%x to print pointer. [HAVE_STDINT_H]: Include . (_TRACE, TRACE, TRACE0, TRACE1, TRACE2, TRACE3, TRACE6): Cast tag to (uintptr_t) before casting it to (void*) to silence GCC warning. * gpgme.h.in (_GPGME_DEPRECATED_OUTSIDE_GPGME): New macro. * sign.c (_GPGME_IN_GPGME): Define it. * keylist.c (_GPGME_IN_GPGME): Define it. * debug.c (_gpgme_debug_begin, _gpgme_debug_add): Handle error in vasprintf and asprintf. * priv-io.h: Include . Declare _gpgme_io_connect. tests/ 2009-06-22 Marcus Brinkmann * gpg/t-support.h (passphrase_cb): Implement write() according to the book to silence compiler warning. * gpgsm/t-support.h (passphrase_cb): Likewise. --- src/gpgme.h.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/gpgme.h.in') diff --git a/src/gpgme.h.in b/src/gpgme.h.in index d7d1efd1..b9f76f56 100644 --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -66,6 +66,14 @@ extern "C" { #define _GPGME_DEPRECATED #endif +/* The macro _GPGME_DEPRECATED_OUTSIDE_GPGME suppresses warnings for + fields we must access in GPGME for ABI compatibility. */ +#ifdef _GPGME_IN_GPGME +#define _GPGME_DEPRECATED_OUTSIDE_GPGME +#else +#define _GPGME_DEPRECATED_OUTSIDE_GPGME _GPGME_DEPRECATED +#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 @@ -615,7 +623,7 @@ struct _gpgme_key_sig unsigned int _obsolete_class _GPGME_DEPRECATED; #else /* Must be set to SIG_CLASS below. */ - unsigned int class _GPGME_DEPRECATED; + unsigned int class _GPGME_DEPRECATED_OUTSIDE_GPGME; #endif /* The user ID string. */ @@ -1294,7 +1302,7 @@ struct _gpgme_new_signature unsigned int _obsolete_class_2; #else /* Must be set to SIG_CLASS below. */ - unsigned int class _GPGME_DEPRECATED; + unsigned int class _GPGME_DEPRECATED_OUTSIDE_GPGME; #endif /* Crypto backend specific signature class. */ -- cgit v1.2.3