From 00913a73c7c93f410e5e05a1825138a61705ea6e Mon Sep 17 00:00:00 2001
From: Björn Jacke <bj@sernet.de>
Date: Sun, 22 Feb 2009 19:46:40 +0100
Subject: prefer gssapi header files from subdirectory

this fixes some compile time noise on FreeBSD 7
---
 source3/include/includes.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/include/includes.h')

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
-- 
cgit 


From d1922725c66c9f4de25c1d664ae03c90e6c098fb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 24 Feb 2009 14:06:27 +0100
Subject: s3: remove unused smb_ldap.h

metze
---
 source3/include/includes.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source3/include/includes.h')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5ab5564e47..80d7bfc6cf 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -677,8 +677,6 @@ struct printjob;
 
 #include "smbldap.h"
 
-#include "smb_ldap.h"
-
 /*
  * Reasons for cache flush.
  */
-- 
cgit 


From 408cde8fcaac96b82d1cb4d638d790122900cff0 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Feb 2009 12:34:14 +0100
Subject: Add tevent_req helpers to includes.h

---
 source3/include/includes.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/include/includes.h')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 80d7bfc6cf..523a11e255 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -577,6 +577,8 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "../talloc/talloc.h"
 
 #include "event.h"
+#include "../lib/util/tevent_unix.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"
-- 
cgit