summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 07:43:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:40 -0500
commita0e6f6c05b438765c8bbb6f8e7f7e6478dc67293 (patch)
tree9decfdcbfb19618549abe4f43acfcfd4f76ca457 /source4/include
parent75ddf59ea110117578acd3a7b889549bfb40473c (diff)
downloadsamba-a0e6f6c05b438765c8bbb6f8e7f7e6478dc67293.tar.gz
samba-a0e6f6c05b438765c8bbb6f8e7f7e6478dc67293.tar.bz2
samba-a0e6f6c05b438765c8bbb6f8e7f7e6478dc67293.zip
r5309: removed ads.h from includes.h
(This used to be commit 196c45b834c39f293b9533cec5cfe5a77382d4e2)
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/ads.h2
-rw-r--r--source4/include/includes.h1
-rw-r--r--source4/include/structs.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/source4/include/ads.h b/source4/include/ads.h
index cdaccbab14..43d9a14777 100644
--- a/source4/include/ads.h
+++ b/source4/include/ads.h
@@ -20,7 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-typedef struct {
+typedef struct ads_struct {
void *ld; /* the active ldap structure */
struct ipv4_addr ldap_ip; /* the ip of the active connection, if any */
time_t last_attempt; /* last attempt to reconnect */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 32a1946e51..2e04e365eb 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -132,7 +132,6 @@ extern int errno;
#include "smb_interfaces.h"
#include "ntvfs/ntvfs.h"
#include "cli_context.h"
-#include "ads.h"
#define malloc_p(type) (type *)malloc(sizeof(type))
#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
diff --git a/source4/include/structs.h b/source4/include/structs.h
index bccbe36efb..61c1f4211c 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -175,3 +175,5 @@ struct nbtd_server;
struct nbtd_interface;
struct mutex_ops;
+
+struct ads_struct;