diff options
| author | Wilco Baan Hofman <wilco@baanhofman.nl> | 2009-04-20 09:57:00 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-04-20 23:16:17 +0200 |
| commit | 4626ffb27e1cfc4f6366b2555412b48359b8952e (patch) | |
| tree | 5fb35974329fd056460139db8fa56b33f19e5af9 | |
| parent | 75f830781fe1f175013eb9530c3cdeb17721677d (diff) | |
| download | samba-4626ffb27e1cfc4f6366b2555412b48359b8952e.tar.gz samba-4626ffb27e1cfc4f6366b2555412b48359b8952e.tar.bz2 samba-4626ffb27e1cfc4f6366b2555412b48359b8952e.zip | |
Move some headers around to avoid confusion.
Signed-off-by: Günther Deschner <gd@samba.org>
| -rw-r--r-- | libgpo/gpo_fetch.c | 2 | ||||
| -rw-r--r-- | libgpo/gpo_ldap.c | 1 | ||||
| -rw-r--r-- | source4/libgpo/gpo_s4.h | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c index 7e41812789..8824a7c376 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 0959ed6b38..a884198ed5 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 3e5cb06bdc..f616f6bd32 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, |