X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=util%2Fgmime-extra.h;h=60ae876562decf6e0dbbd70979573b99d07221ac;hb=b7ac4c05e118047442378f58eeb69d43bd1cbdb1;hp=ca822b8cf53b4e0b1b0509b3dcb5d4d92d46ca54;hpb=040c3236afcf95bead0324a48c2e0b9cd7934993;p=notmuch

diff --git a/util/gmime-extra.h b/util/gmime-extra.h
index ca822b8c..60ae8765 100644
--- a/util/gmime-extra.h
+++ b/util/gmime-extra.h
@@ -1,22 +1,13 @@
 #ifndef _GMIME_EXTRA_H
 #define _GMIME_EXTRA_H
 #include <gmime/gmime.h>
-
-GMimeStream *g_mime_stream_stdout_new(void);
-
 #include <talloc.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#if (GMIME_MAJOR_VERSION < 3)
-
-#define GMIME_ADDRESS_TYPE_TO GMIME_RECIPIENT_TYPE_TO
-#define GMIME_ADDRESS_TYPE_CC GMIME_RECIPIENT_TYPE_CC
-#define GMIME_ADDRESS_TYPE_BCC GMIME_RECIPIENT_TYPE_BCC
-
-#define g_mime_2_6_unref(obj) g_object_unref (obj)
-#define g_mime_3_unused(arg) arg
-#define g_mime_certificate_get_fpr16(cert) g_mime_certificate_get_key_id (cert)
-#else /* GMime >= 3.0 */
+GMimeStream *g_mime_stream_stdout_new(void);
 
 #define GMIME_ENABLE_RFC_2047_WORKAROUNDS 0xdeadbeef
 #define g_mime_content_type_to_string(c) g_mime_content_type_get_mime_type (c)
@@ -43,10 +34,6 @@ typedef GMimeAddressType GMimeRecipientType;
 
 typedef GMimeSignatureStatus GMimeSignatureError;
 
-#define g_mime_2_6_unref(obj) /*ignore*/
-#define g_mime_3_unused(arg) unused(arg)
-#endif
-
 /**
  * Get last 16 hex digits of fingerprint ("keyid")
  */
@@ -100,4 +87,8 @@ gint64 g_mime_utils_header_decode_date_unix (const char *date);
  */
 const char * g_mime_certificate_get_valid_userid (GMimeCertificate *cert);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif