svn commit: samba r24812 - in branches/SAMBA_4_0: . source source/include source/lib/util source/librpc/rpc source/pidl/lib/Parse/Pidl/Samba4 source/pidl/tests

[jelmer at samba.org]

Author: jelmer
Date: 2007-08-30 22:25:59 +0000 (Thu, 30 Aug 2007)
New Revision: 24812

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24812

Log:
Fix headers for external users.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/headermap.txt
   branches/SAMBA_4_0/source/include/core.h
   branches/SAMBA_4_0/source/lib/util/data_blob.h
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
   branches/SAMBA_4_0/source/pidl/tests/Util.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/headermap.txt
===================================================================
--- branches/SAMBA_4_0/source/headermap.txt	2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/headermap.txt	2007-08-30 22:25:59 UTC (rev 24812)
@@ -39,7 +39,6 @@
 libcli/util/nt_status.h: core/ntstatus.h
 libcli/cldap/cldap.h: cldap.h
 lib/samba3/samba3.h: samba3.h
-include/core.h: core.h
 librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h
 librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
 librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h
@@ -90,7 +89,7 @@
 librpc/gen_ndr/ndr_svcctl_c.h: dcerpc/ndr_svcctl_c.h
 lib/cmdline/popt_common.h: samba/popt.h
 lib/util/dlinklist.h: dlinklist.h
-lib/util/data_blob.h: data_blob.h
+lib/util/data_blob.h: util/data_blob.h
 lib/util/time.h: util/time.h
 version.h: samba/version.h
 param/proto.h: param/proto.h

Modified: branches/SAMBA_4_0/source/include/core.h
===================================================================
--- branches/SAMBA_4_0/source/include/core.h	2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/include/core.h	2007-08-30 22:25:59 UTC (rev 24812)
@@ -27,10 +27,6 @@
 
 #include <stdlib.h>
 
-/* by making struct ldb_val and DATA_BLOB the same, we can simplify
-   a fair bit of code */
-#define ldb_val datablob
-
 /*
   we use struct ipv4_addr to avoid having to include all the
   system networking headers everywhere

Modified: branches/SAMBA_4_0/source/lib/util/data_blob.h
===================================================================
--- branches/SAMBA_4_0/source/lib/util/data_blob.h	2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/lib/util/data_blob.h	2007-08-30 22:25:59 UTC (rev 24812)
@@ -19,6 +19,12 @@
 #ifndef _SAMBA_DATABLOB_H_
 #define _SAMBA_DATABLOB_H_
 
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
+#include <talloc.h>
+
 /* used to hold an arbitrary blob of data */
 typedef struct datablob {
 	uint8_t *data;
@@ -30,6 +36,10 @@
 	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
+
 #define data_blob(ptr, size) data_blob_named(ptr, size, "DATA_BLOB: "__location__)
 #define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr, size, "DATA_BLOB: "__location__)
 #define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx, (blob)->data, (blob)->length, "DATA_BLOB: "__location__)

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2007-08-30 22:25:59 UTC (rev 24812)
@@ -23,7 +23,7 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
-#include "core.h"
+#include "lib/util/data_blob.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/libndr.h"
 

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/main.mk	2007-08-30 22:25:59 UTC (rev 24812)
@@ -32,8 +32,7 @@
 include scripting/swig/config.mk
 include kdc/config.mk
 
-DEFAULT_HEADERS = $(srcdir)/include/core.h \
-		  $(srcdir)/lib/util/dlinklist.h \
+DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
 		  $(srcdir)/version.h
 
 binaries: $(BINARIES)

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2007-08-30 22:25:59 UTC (rev 24812)
@@ -382,7 +382,7 @@
 	%headerstructs = ();
 	pidl "/* header auto-generated by pidl */\n\n";
 	if (!is_intree()) {
-		pidl "#include <core.h>\n";
+		pidl "#include <util/data_blob.h>\n";
 	}
 	pidl "#include <stdint.h>\n";
 	pidl "\n";

Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm	2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm	2007-08-30 22:25:59 UTC (rev 24812)
@@ -102,7 +102,7 @@
 	print CC "#include <stdio.h>\n";
 	print CC "#include <stdbool.h>\n";
 	print CC "#include <stdarg.h>\n";
-	print CC "#include <core.h>\n";
+	print CC "#include <util/data_blob.h>\n";
 	print CC $header;
 	print CC $ndrheader;
 	print CC $extra if ($extra);