From f1ec43bd3f18cf03ffcad479cbeee1cd7709698e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 23 Dec 2003 08:21:08 +0000 Subject: [PATCH] C++ fixes --- trunk/gpgme/ChangeLog | 5 +++++ trunk/gpgme/gpgme.h | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 9621e0b..61b69fe 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2003-12-22 Werner Koch + + * gpgme.h (_GPGME_D_CLASS): Kludge for C++ compatibility without + changing the C API. + 2003-11-19 Werner Koch * conversion.c (_gpgme_parse_timestamp): New. diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h index 1e17488..ac5cea7 100644 --- a/trunk/gpgme/gpgme.h +++ b/trunk/gpgme/gpgme.h @@ -44,7 +44,11 @@ extern "C" { #if 0 /* just to make Emacs auto-indent happy */ } #endif -#endif +/* Keyword renaming for the sake of C doubleplus. */ +#define _GPGME_D_CLASS clazz +#else +#define _GPGME_D_CLASS class +#endif /* __cplusplus */ #include @@ -507,7 +511,7 @@ struct _gpgme_key_sig gpgme_error_t status; /* Crypto backend specific signature class. */ - unsigned int class; + unsigned int _GPGME_D_CLASS; /* The user ID string. */ char *uid; @@ -1087,7 +1091,7 @@ struct _gpgme_new_signature char *fpr; /* Crypto backend specific signature class. */ - unsigned int class; + unsigned int _GPGME_D_CLASS; }; typedef struct _gpgme_new_signature *gpgme_new_signature_t; -- 2.26.2