From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 1 Sep 2012 08:17:17 +0000 (+0200)
Subject: reverted kerberos-related functrions to C linkage
X-Git-Tag: sourceformat-review-1~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b331e76dcf7b4fe58ba3821308f477297d73abd6;p=thirdparty%2Fsquid.git

reverted kerberos-related functrions to C linkage
---

diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc
index 7988fb9bc1..1f926b4654 100644
--- a/src/peer_proxy_negotiate_auth.cc
+++ b/src/peer_proxy_negotiate_auth.cc
@@ -33,6 +33,10 @@
 #include "Debug.h"
 #include "peer_proxy_negotiate_auth.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if HAVE_PROFILE_H
 #include <profile.h>
 #endif				/* HAVE_PROFILE_H */
@@ -543,4 +547,7 @@ cleanup:
         return token;
     }
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* HAVE_KRB5 && HAVE_GSSAPI */
diff --git a/src/peer_proxy_negotiate_auth.h b/src/peer_proxy_negotiate_auth.h
index c4cf633322..36c3a792cb 100644
--- a/src/peer_proxy_negotiate_auth.h
+++ b/src/peer_proxy_negotiate_auth.h
@@ -34,7 +34,7 @@
 
 #if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI
     /* upstream proxy authentication */
-extern char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
+SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
 #endif