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 d7bc67955b2203b732e611324346449da71d78c4..695ab167ef8daef75ec9e6ff05e1bbed49e24530 100644 (file)
--- 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 c29f95be0155bf698c89bbf853ea6f76988dee43..1f7038fd9283697ecdbcdccb2342bad164da5d96 100644 (file)
--- 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 de136b037cef4e9088d679235e9105d8a8b60cb2..74b074ee11977485ce38566f8dc5be5aecd7cefa 100644 (file)
--- 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