Add 'extern "C"' for C++ compatibility; also check for __cplusplus

since some C++ compilers don't set __STDC__

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10008 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 99a4261fd4171876ac9cf4a7fd8a56ea4a8e1780..41c2d579c7f1fe5cd373d3ef0bab9abbd23f20de 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 18 13:52:29 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * gssapi.hin: Add 'extern "C"' for C++ compatibility; also check
+               for __cplusplus since some C++ compilers don't set
+               __STDC__
+
 Mon Mar 17 14:42:33 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * gssapi.hin: Fix header file so that winmac.h is #included when

diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index d78c09db53913ea2eae98a4e5716555503cb5b51..8a3efe605082c5e77229baf36741c9f7e6d7dfca 100644 (file)
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -50,7 +50,7 @@
  * Make sure we have a definition for PROTOTYPE.
  */
 #if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) || defined(__ultrix)
+#if defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(__ultrix)
 #define PROTOTYPE(x) x
 #else
 #define PROTOTYPE(x) ()
@@ -322,6 +322,10 @@ typedef    int             gss_cred_usage_t;
  * Finally, function prototypes for the GSSAPI routines.
  */
 
+#ifdef __cplusplus
+#extern "C" {
+#endif
+
 KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_acquire_cred
 PROTOTYPE( (OM_uint32 FAR *,           /* minor_status */
             gss_name_t,                        /* desired_name */
@@ -653,6 +657,10 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             int FAR *           /* qop_state */
            ));
 
+#ifdef __cplusplus
+}
+#endif
+
 /* XXXX these are not part of the GSSAPI C bindings!  (but should be) */
 
 #define GSS_CALLING_ERROR_FIELD(x) \