summaryrefslogtreecommitdiff
path: root/source4/include/includes.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-03 13:41:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:39 -0500
commit25bb00fbcd409572e1c19c05fdc42c883936780b (patch)
treee6096ae728e2a5645e39ede037de0cae39cd12ab /source4/include/includes.h
parent097ffed015826ff31b5f89742deed8f4d21b88f3 (diff)
downloadsamba-25bb00fbcd409572e1c19c05fdc42c883936780b.tar.gz
samba-25bb00fbcd409572e1c19c05fdc42c883936780b.tar.bz2
samba-25bb00fbcd409572e1c19c05fdc42c883936780b.zip
r12693: Move core data structures out of smb.h into core.h
torture prototypes in seperate header (This used to be commit 73610639b23ca3743077193fa0b1de7c7f65944d)
Diffstat (limited to 'source4/include/includes.h')
-rw-r--r--source4/include/includes.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index b6d074f8b2..849850daa6 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -67,16 +67,6 @@
#define HAVE_ILDAP 1
/*
- * Define VOLATILE if needed.
- */
-
-#define False (0)
-#define True (1)
-#define Auto (2)
-
-typedef int BOOL;
-
-/*
we use struct ipv4_addr to avoid having to include all the
system networking headers everywhere
*/
@@ -84,7 +74,6 @@ struct ipv4_addr {
uint32_t addr;
};
-
#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
#include "lib/replace/replace.h"
@@ -95,12 +84,13 @@ struct ipv4_addr {
#include "structs.h"
#include "trans2.h"
#include "nterr.h"
+#include "core.h"
+#include "smb.h"
#include "charset.h"
#include "debug.h"
#include "doserr.h"
#include "enums.h"
#include "smb_macros.h"
-#include "smb.h"
#include "byteorder.h"
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/dcerpc.h"