r12693: Move core data structures out of smb.h into core.h

torture prototypes in seperate header
(This used to be commit 73610639b23ca3743077193fa0b1de7c7f65944d)

3 files changed, 62 insertions, 32 deletions

diff --git a/source4/include/core.h b/source4/include/core.h
new file mode 100644
index 0000000000..08fc2c48ba
--- /dev/null
+++ b/source4/include/core.h
@@ -0,0 +1,60 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Core Samba data types
+
+   Copyright (C) Andrew Tridgell              1992-2000
+   Copyright (C) John H Terpstra              1996-2002
+   Copyright (C) Luke Kenneth Casson Leighton 1996-2000
+   Copyright (C) Paul Ashton                  1998-2000
+   Copyright (C) Simo Sorce                   2001-2002
+   Copyright (C) Martin Pool		      2002
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _SAMBA_CORE_H
+#define _SAMBA_CORE_H
+
+/*
+ * Define VOLATILE if needed.
+ */
+
+#define False (0)
+#define True (1)
+#define Auto (2)
+
+typedef int BOOL;
+
+/* used to hold an arbitrary blob of data */
+typedef struct datablob {
+	uint8_t *data;
+	size_t length;
+} DATA_BLOB;
+
+struct data_blob_list_item {
+	struct data_blob_list_item *prev,*next;
+	DATA_BLOB blob;
+};
+
+/* by making struct ldb_val and DATA_BLOB the same, we can simplify
+   a fair bit of code */
+#define ldb_val datablob
+
+/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */
+typedef uint64_t NTTIME;
+
+typedef NTSTATUS (*init_module_fn) (void);
+
+#endif /* _SMB_H */
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"
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 73385d4373..f7a46e757d 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -187,24 +187,6 @@ enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED,
    incorrect parameters - what does it mean? maybe created temporary file? */
 #define NTCREATEX_ACTION_UNKNOWN 5
 
-/* used to hold an arbitrary blob of data */
-typedef struct datablob {
-	uint8_t *data;
-	size_t length;
-} DATA_BLOB;
-
-struct data_blob_list_item {
-	struct data_blob_list_item *prev,*next;
-	DATA_BLOB blob;
-};
-
-/* by making struct ldb_val and DATA_BLOB the same, we can simplify
-   a fair bit of code */
-#define ldb_val datablob
-
-/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */
-typedef uint64_t NTTIME;
-
 #define SMB_MAGIC 0x424D53FF /* 0xFF 'S' 'M' 'B' */
 
 /* the basic packet size, assuming no words or bytes. Does not include the NBT header */
@@ -608,6 +590,4 @@ enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
 #define FS_ATTR_ENCRYPTION                        0x00020000
 #define FS_ATTR_NAMED_STREAMS                     0x00040000
 
-typedef NTSTATUS (*init_module_fn) (void);
-
 #endif /* _SMB_H */