From owner-svn-src-all@FreeBSD.ORG  Sun Jun 30 07:46:24 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F10B1452;
 Sun, 30 Jun 2013 07:46:23 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E337A167B;
 Sun, 30 Jun 2013 07:46:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5U7kN7A098762;
 Sun, 30 Jun 2013 07:46:23 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5U7kNRw098760;
 Sun, 30 Jun 2013 07:46:23 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201306300746.r5U7kNRw098760@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sun, 30 Jun 2013 07:46:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252409 - in head: crypto/heimdal/lib/gssapi/gssapi
 include/gssapi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Jun 2013 07:46:24 -0000

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