From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 28 Jul 2011 21:03:07 +0000 (-0700)
Subject: Avoid a "shadows global declaration" warning on old MIT Kerberos
X-Git-Tag: curl-7_22_0~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c01c000b1631591a2b7d78450fee5bf21990e993;p=thirdparty%2Fcurl.git

Avoid a "shadows global declaration" warning on old MIT Kerberos

Defining NCOMPAT eliminates the backwards-compatibility macros
that are the source of the problem and which we don't need,
anyway.
---

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index d7bc67955b..695ab167ef 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -25,6 +25,7 @@
 #ifdef HAVE_GSSAPI
 #ifdef HAVE_OLD_GSSMIT
 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+#define NCOMPAT 1
 #endif
 
 #ifndef CURL_DISABLE_HTTP
diff --git a/lib/krb5.c b/lib/krb5.c
index c29f95be01..1f7038fd92 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -39,6 +39,7 @@
 
 #ifdef HAVE_OLD_GSSMIT
 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+#define NCOMPAT 1
 #endif
 
 #ifdef HAVE_NETDB_H
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index de136b037c..74b074ee11 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -27,6 +27,7 @@
 #ifdef HAVE_GSSAPI
 #ifdef HAVE_OLD_GSSMIT
 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+#define NCOMPAT 1
 #endif
 #ifndef gss_nt_service_name
 #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE