summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-02-24 11:40:28 +1100
committerAndrew Tridgell <tridge@samba.org>2009-02-24 11:40:28 +1100
commit3a1b4c00eb96634229fb730e9b38e8df5180756a (patch)
tree2642c03cc4f0f8e52d4718b93facfe411a52d9ab /source3/include/includes.h
parentb9860043dc092df25d4a39074e106d7367ebbe8f (diff)
parentfaa1100d229aef56da5d48f5c19ec901e520f8ef (diff)
downloadsamba-3a1b4c00eb96634229fb730e9b38e8df5180756a.tar.gz
samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.tar.bz2
samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1906830d48..5ab5564e47 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -190,12 +190,12 @@ typedef int ber_int_t;
#undef HAVE_LDAP
#endif
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
#endif
#if HAVE_COM_ERR_H