From 83545dc52abc760cc2d2b53c4af3e93d885d2444 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Tue, 18 Mar 1997 18:52:55 +0000 Subject: [PATCH] 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 --- src/lib/gssapi/generic/ChangeLog | 6 ++++++ src/lib/gssapi/generic/gssapi.hin | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 99a4261fd..41c2d579c 100644 --- 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 + + * 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 * 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 d78c09db5..8a3efe605 100644 --- 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) \ -- 2.26.2