diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-07-13 00:18:10 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-07-13 00:18:10 +0000 |
| commit | 6c60a73fb24281a7da0c4d7d7ae86710f58869f7 (patch) | |
| tree | e70ed7909842ee25daff459e397998c448d860a0 /src/lib/gssapi/generic/gssapi_generic.h | |
| parent | 32f422d93aad0f56ff9f4ae602c1318903314bd1 (diff) | |
| download | krb5-6c60a73fb24281a7da0c4d7d7ae86710f58869f7.tar.gz krb5-6c60a73fb24281a7da0c4d7d7ae86710f58869f7.tar.xz krb5-6c60a73fb24281a7da0c4d7d7ae86710f58869f7.zip | |
* gssapi_generic.h: allow inclusion by C++
* gssapi.hin: Conditionalized pragmas for Metrowerks
* gssapi.hin: Added check for CFM compiles. Removed dependency on
PRAGMA_* macros. Moved check struct alignment check before struct
declarations.
* disp_com_err_status.c, gssapi.hin, gssapi_generic.h:
Updated Mac OS X headers to new framework layout
* gssapi_generic.h: Fixed check for Mac OS X includes.
[pullups from 1-2-2-branch]
* gssapiP_generic.h: use "" include for krb5.h
[pullup from 1-2-2-branch]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14635 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/generic/gssapi_generic.h')
| -rw-r--r-- | src/lib/gssapi/generic/gssapi_generic.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h index 2a0c59fdd8..d8c7ec66a6 100644 --- a/src/lib/gssapi/generic/gssapi_generic.h +++ b/src/lib/gssapi/generic/gssapi_generic.h @@ -27,12 +27,22 @@ * $Id$ */ -#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) -#include <gssapi.h> +#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__)) +#include <Kerberos/gssapi.h> #else #include <gssapi/gssapi.h> #endif +#if defined(__cplusplus) && !defined(GSSAPIGENERIC_BEGIN_DECLS) +#define GSSAPIGENERIC_BEGIN_DECLS extern "C" { +#define GSSAPIGENERIC_END_DECLS } +#else +#define GSSAPIGENERIC_BEGIN_DECLS +#define GSSAPIGENERIC_END_DECLS +#endif + +GSSAPIGENERIC_BEGIN_DECLS + /* Deprecated MIT krb5 oid names provided for compatibility. * The correct oids (GSS_C_NT_USER_NAME, etc) from rfc 2744 * are defined in gssapi.h. */ @@ -44,4 +54,6 @@ extern gss_OID gss_nt_service_name_v2; GSS_DLLIMP extern gss_OID gss_nt_service_name; extern gss_OID gss_nt_exported_name; +GSSAPIGENERIC_END_DECLS + #endif /* _GSSAPI_GENERIC_H_ */ |