r13654: Move some more stuff out of include/

(This used to be commit 2ec7bba03a2edf713004941e9ed74798f5cf8d32)

8 files changed, 15 insertions, 15 deletions

diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/header.pm
index 3b178c8226..456c29368a 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/header.pm
@@ -4,7 +4,7 @@
 #  Copyright (C) Stefan (metze) Metzmacher 2004
 #  Released under the GNU GPL
 
-package smb_build_h;
+package header;
 use strict;
 
 sub _add_define_section($)
@@ -85,10 +85,10 @@ sub create_smb_build_h($$)
 {
 	my ($CTX, $file) = @_;
 
-	open(SMB_BUILD_H,">$file") || die ("Can't open `$file'\n");
-	print SMB_BUILD_H "/* autogenerated by build/smb_build/main.pl */\n";
-	print SMB_BUILD_H _prepare_build_h($CTX);
-	close(SMB_BUILD_H);
+	open(BUILD_H,">$file") || die ("Can't open `$file'\n");
+	print BUILD_H "/* autogenerated by build/smb_build/main.pl */\n";
+	print BUILD_H _prepare_build_h($CTX);
+	close(BUILD_H);
 
 	print __FILE__.": creating $file\n";
 }
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 2b6594d809..bec1be791c 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -6,7 +6,7 @@
 #  Released under the GNU GPL				
 
 use smb_build::makefile;
-use smb_build::smb_build_h;
+use smb_build::header;
 use smb_build::input;
 use smb_build::config_mk;
 use smb_build::output;
@@ -79,6 +79,6 @@ foreach my $key (values %$OUTPUT) {
 }
 
 $mkenv->write("Makefile");
-smb_build_h::create_smb_build_h($OUTPUT, "include/smb_build.h");
+header::create_smb_build_h($OUTPUT, "include/build.h");
 
 1;
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 3babb4eef5..444feab6fc 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -108,7 +108,7 @@ struct ipv4_addr {
 #include "librpc/ndr/ndr_orpc.h"
 #include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
-#include "smb_interfaces.h"
+#include "libcli/raw/interfaces.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
 
diff --git a/source4/include/pstring.h b/source4/include/pstring.h
index 3683849686..392ada4533 100644
--- a/source4/include/pstring.h
+++ b/source4/include/pstring.h
@@ -26,6 +26,7 @@
 */
 
 #ifndef _PSTRING
+#define _PSTRING
 
 #define PSTRING_LEN 1024
 #define FSTRING_LEN 256
@@ -33,5 +34,9 @@
 typedef char pstring[PSTRING_LEN];
 typedef char fstring[FSTRING_LEN];
 
-#define _PSTRING
+#define pstrcpy(d,s) safe_strcpy((d), (s),sizeof(pstring)-1)
+#define pstrcat(d,s) safe_strcat((d), (s),sizeof(pstring)-1)
+#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1)
+#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1)
+
 #endif
diff --git a/source4/include/safe_string.h b/source4/include/safe_string.h
index 57c5d21429..43e094467c 100644
--- a/source4/include/safe_string.h
+++ b/source4/include/safe_string.h
@@ -47,11 +47,6 @@
 
 #endif /* !_SPLINT_ */
 
-#define pstrcpy(d,s) safe_strcpy((d), (s),sizeof(pstring)-1)
-#define pstrcat(d,s) safe_strcat((d), (s),sizeof(pstring)-1)
-#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1)
-#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1)
-
 /* replace some string functions with multi-byte
    versions */
 #define strlower(s) strlower_m(s)
diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h
index 356d968083..956b0709ca 100644
--- a/source4/include/smb_macros.h
+++ b/source4/include/smb_macros.h
@@ -1,6 +1,6 @@
 /* 
    Unix SMB/CIFS implementation.
-   SMB parameters and setup
+   Some convenient macros
    Copyright (C) Andrew Tridgell 1992-1999
    Copyright (C) John H Terpstra 1996-1999
    Copyright (C) Luke Kenneth Casson Leighton 1996-1999
diff --git a/source4/include/mutex.h b/source4/lib/mutex.h
index bb26c84f5d..bb26c84f5d 100644
--- a/source4/include/mutex.h
+++ b/source4/lib/mutex.h
diff --git a/source4/include/smb_interfaces.h b/source4/libcli/raw/interfaces.h
index 49fe085f2c..49fe085f2c 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/libcli/raw/interfaces.h