Author: hrs
Date: Sun Jun 30 07:46:22 2013
New Revision: 252409
URL: http://svnweb.freebsd.org/changeset/base/252409
Log:
Fix gssapi/gssapi_krb5.h after Heimdal 1.5.1 import.
Reviewed by: dfr
Modified:
head/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
head/include/gssapi/gssapi.h
Modified: head/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
==============================================================================
--- head/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Sun Jun 30 07:37:31
2013 (r252408)
+++ head/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Sun Jun 30 07:46:22
2013 (r252409)
@@ -36,7 +36,7 @@
#ifndef GSSAPI_KRB5_H_
#define GSSAPI_KRB5_H_
-#include <gssapi.h>
+#include <gssapi/gssapi.h>
GSSAPI_CPP_START
Modified: head/include/gssapi/gssapi.h
==============================================================================
--- head/include/gssapi/gssapi.h Sun Jun 30 07:37:31 2013
(r252408)
+++ head/include/gssapi/gssapi.h Sun Jun 30 07:46:22 2013
(r252409)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
