Merge branch 'legacy_63'

[~andy/fetchmail] / gssapi.c

diff --git a/gssapi.c b/gssapi.c
index 5a05ff8f9364b92683dafc4c7a4794ecacf07e14..95d631b87c2e6e4db3e2f9ec774554daac89e4f6 100644 (file)
--- a/gssapi.c
+++ b/gssapi.c
@@ -8,13 +8,11 @@
 #include  <stdio.h>
 #include  <string.h>
 #include  <ctype.h>
-#if defined(STDC_HEADERS)
 #include  <stdlib.h>
-#endif
 #include  "fetchmail.h"
 #include  "socket.h"
 
-#include  "i18n.h"
+#include  "gettext.h"
 #include "fm_md5.h"
 
 #include <sys/types.h>
@@ -33,7 +31,7 @@
 #  ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
 #    include <gssapi/gssapi_generic.h>
 #  endif
-#  ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
+#  if HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE + 0 == 0
 #    define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
 #  endif
 #  endif