summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-12-17 00:06:34 +0100
committerStefan Metzmacher <metze@samba.org>2008-12-17 11:04:45 +0100
commit081f8883bafc11ca7c08f868ec19f1ea32071837 (patch)
tree2e190f34ba0cb18321e0581f5e3ac242ee93f03b /source4/libcli
parent675b363b712e0b91b9b7d1189a819a36853db539 (diff)
downloadsamba-081f8883bafc11ca7c08f868ec19f1ea32071837.tar.gz
samba-081f8883bafc11ca7c08f868ec19f1ea32071837.tar.bz2
samba-081f8883bafc11ca7c08f868ec19f1ea32071837.zip
s4: fix LIBEVENTS dependencies and use more forward declarations
We should only include events.h where we really need it and prefer forward declarations of 'struct event_context' metze
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/composite/composite.h2
-rw-r--r--source4/libcli/ldap/ldap_ndr.c1
-rw-r--r--source4/libcli/resolve/resolve.c1
-rw-r--r--source4/libcli/resolve/resolve.h1
4 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h
index 28cd6a88dc..25799d6a94 100644
--- a/source4/libcli/composite/composite.h
+++ b/source4/libcli/composite/composite.h
@@ -24,6 +24,8 @@
#include "libcli/raw/interfaces.h"
+struct event_context;
+
/*
this defines the structures associated with "composite"
requests. Composite requests are libcli requests that are internally
diff --git a/source4/libcli/ldap/ldap_ndr.c b/source4/libcli/ldap/ldap_ndr.c
index 5e938ea148..f0a11ba41f 100644
--- a/source4/libcli/ldap/ldap_ndr.c
+++ b/source4/libcli/ldap/ldap_ndr.c
@@ -21,7 +21,6 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
#include "libcli/ldap/ldap.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_misc.h"
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index 7d1c48cbee..12764e1084 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -21,7 +21,6 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
#include "libcli/composite/composite.h"
#include "libcli/resolve/resolve.h"
#include "librpc/gen_ndr/ndr_nbt.h"
diff --git a/source4/libcli/resolve/resolve.h b/source4/libcli/resolve/resolve.h
index 01fc930fce..942a0a0bd2 100644
--- a/source4/libcli/resolve/resolve.h
+++ b/source4/libcli/resolve/resolve.h
@@ -23,6 +23,7 @@
#define __RESOLVE_H__
struct socket_address;
+struct event_context;
#include "../libcli/nbt/libnbt.h"
typedef struct composite_context *(*resolve_name_send_fn)(TALLOC_CTX *mem_ctx,