summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2013-06-30 07:46:22 +0000
committerhrs <hrs@FreeBSD.org>2013-06-30 07:46:22 +0000
commitc3008dddb18ab0a1f34c449782a98cec691a478a (patch)
tree828e732e9164b9a1e5a21aaa549d380b38bc00cf
parent86e2a6aa52b322e694431e4ddc508c6317492044 (diff)
downloadFreeBSD-src-c3008dddb18ab0a1f34c449782a98cec691a478a.zip
FreeBSD-src-c3008dddb18ab0a1f34c449782a98cec691a478a.tar.gz
Fix gssapi/gssapi_krb5.h after Heimdal 1.5.1 import.
Reviewed by: dfr
-rw-r--r--crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h2
-rw-r--r--include/gssapi/gssapi.h27
2 files changed, 28 insertions, 1 deletions
diff --git a/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h b/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
index 2f605f5..e7bb4c8 100644
--- a/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
+++ b/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
@@ -36,7 +36,7 @@
#ifndef GSSAPI_KRB5_H_
#define GSSAPI_KRB5_H_
-#include <gssapi.h>
+#include <gssapi/gssapi.h>
GSSAPI_CPP_START
diff --git a/include/gssapi/gssapi.h b/include/gssapi/gssapi.h
index 032e784..bd2722c 100644
--- a/include/gssapi/gssapi.h
+++ b/include/gssapi/gssapi.h
@@ -44,6 +44,33 @@ typedef __ssize_t ssize_t;
#define _SSIZE_T_DECLARED
#endif
+/* Compatibility with Heimdal 1.5.1 */
+#ifndef GSSAPI_CPP_START
+#ifdef __cplusplus
+#define GSSAPI_CPP_START extern "C" {
+#define GSSAPI_CPP_END }
+#else
+#define GSSAPI_CPP_START
+#define GSSAPI_CPP_END
+#endif
+#endif
+
+/* Compatibility with Heimdal 1.5.1 */
+#ifndef BUILD_GSSAPI_LIB
+#define GSSAPI_LIB_FUNCTION
+#define GSSAPI_LIB_CALL
+#define GSSAPI_LIB_VARIABLE
+#endif
+
+/* Compatibility with Heimdal 1.5.1 */
+#ifndef GSSAPI_DEPRECATED_FUNCTION
+#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
+#define GSSAPI_DEPRECATED_FUNCTION(X) __attribute__((deprecated))
+#else
+#define GSSAPI_DEPRECATED_FUNCTION(X)
+#endif
+#endif
+
#if 0
/*
* If the platform supports the xom.h header file, it should be
OpenPOWER on IntegriCloud