From: Wilco Baan Hofman <wilco@baanhofman.nl>
Date: Mon, 20 Apr 2009 07:57:00 +0000 (+0200)
Subject: Move some headers around to avoid confusion.
X-Git-Tag: tdb-1.1.5~935
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4626ffb27e1cfc4f6366b2555412b48359b8952e;p=thirdparty%2Fsamba.git

Move some headers around to avoid confusion.

Signed-off-by: Günther Deschner <gd@samba.org>
---

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 7e41812789e..8824a7c376c 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -29,7 +29,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli_proto.h"
 #include "libgpo/ads_convenience.h"
-#include "libgpo/gpo.h"
+#include "libgpo/gpo_s4.h"
 #endif
 
 /****************************************************************
diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index 0959ed6b387..a884198ed5b 100644
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #if _SAMBA_BUILD_ == 4
 #include "libgpo/gpo.h"
+#include "libgpo/gpo_s4.h"
 #include "source4/libgpo/ads_convenience.h"
 #endif
 
diff --git a/source4/libgpo/gpo_s4.h b/source4/libgpo/gpo_s4.h
index 3e5cb06bdc6..f616f6bd320 100644
--- a/source4/libgpo/gpo_s4.h
+++ b/source4/libgpo/gpo_s4.h
@@ -20,8 +20,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __LIBGPO_GPO_H__
-#define __LIBGPO_GPO_H__
+#ifndef __LIBGPO_GPO_S4_H__
+#define __LIBGPO_GPO_S4_H__
+
+#if _SAMBA_BUILD_ == 4
+#include "source4/libcli/libcli.h"
+#endif
 
 NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
 		       struct smbcli_state *cli,