aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2010-01-22 02:00:27 +0000
committerMatthias Andree <matthias.andree@gmx.de>2010-01-22 02:00:27 +0000
commitc79f83712cf4731847021b9d96d8459ecf755cac (patch)
tree01f975b5d7b20e69e737739e3dc22190b1e360f6
parent6a48a98fb004842cea22598b8e43a5f1f1fcbc4c (diff)
downloadfetchmail-c79f83712cf4731847021b9d96d8459ecf755cac.tar.gz
fetchmail-c79f83712cf4731847021b9d96d8459ecf755cac.tar.bz2
fetchmail-c79f83712cf4731847021b9d96d8459ecf755cac.zip
Fix gssapi.h compiler warning on FreeBSD...
...and only include gssapi.h if we're not including gssapi/gssapi.h. svn path=/branches/BRANCH_6-3/; revision=5461
-rw-r--r--NEWS4
-rw-r--r--gssapi.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 8ef8abc7..92e130f2 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,10 @@ fetchmail 6.3.14 (not yet released):
improving overall robustness of the IMAP client), bug report and testing by
Matt Doran, with further hints from Timo Sirainen.
+# CHANGES
+* Only include gssapi.h if we're not including gssapi/gssapi.h, to fix a FreeBSD
+ compiler warning about gssapi.h being obsolete.
+
# DOCUMENTATION
* The README.SSL document was revised for grammar, spelling, and clarity.
Courtesy of Robert Mullin.
diff --git a/gssapi.c b/gssapi.c
index 883f748f..1b294bab 100644
--- a/gssapi.c
+++ b/gssapi.c
@@ -24,7 +24,7 @@
# ifdef HAVE_GSS_H
# include <gss.h>
# else
-# ifdef HAVE_GSSAPI_H
+# if defined(HAVE_GSSAPI_H) && !defined(HAVE_GSSAPI_GSSAPI_H)
# include <gssapi.h>
# endif
# ifdef HAVE_GSSAPI_GSSAPI_H