From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 26 Dec 2011 13:31:08 +0000 (+0200)
Subject: pkcs11.h and abstract.h use extern C idiom for C++.
X-Git-Tag: gnutls_3_0_10~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79af6bb434d646b6a05f19b699c68ceba11fb704;p=thirdparty%2Fgnutls.git

pkcs11.h and abstract.h use extern C idiom for C++.
---

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 02821de9d1..84bac692fc 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -29,6 +29,11 @@
 #include <gnutls/pkcs11.h>
 #include <gnutls/openpgp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /* Public key operations */
 
 struct gnutls_pubkey_st;
@@ -280,4 +285,8 @@ gnutls_certificate_set_key (gnutls_certificate_credentials_t res,
                             int pcert_list_size,
                             gnutls_privkey_t key);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 31fa5519f5..14576f244c 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -28,6 +28,11 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define GNUTLS_PKCS11_MAX_PIN_LEN 32
 
 /**
@@ -343,4 +348,8 @@ gnutls_pkcs11_privkey_generate (const char* url,
   gnutls_pk_algorithm_t pk, unsigned int bits, 
   const char* label, unsigned int flags);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif