diff options
| -rw-r--r-- | source4/headermap.txt | 3 | ||||
| -rw-r--r-- | source4/include/core.h | 4 | ||||
| -rw-r--r-- | source4/lib/util/data_blob.h | 10 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 2 | ||||
| -rw-r--r-- | source4/main.mk | 3 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/Header.pm | 2 | ||||
| -rw-r--r-- | source4/pidl/tests/Util.pm | 2 |
7 files changed, 15 insertions, 11 deletions
diff --git a/source4/headermap.txt b/source4/headermap.txt index ff67a66935..30fef21ed2 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -39,7 +39,6 @@ libcli/util/doserr.h: core/doserr.h 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.h: dcerpc/ndr_svcctl.h 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 diff --git a/source4/include/core.h b/source4/include/core.h index 55e89e9761..fc66e10283 100644 --- a/source4/include/core.h +++ b/source4/include/core.h @@ -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 diff --git a/source4/lib/util/data_blob.h b/source4/lib/util/data_blob.h index acecb88132..e39b2eaf45 100644 --- a/source4/lib/util/data_blob.h +++ b/source4/lib/util/data_blob.h @@ -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 @@ struct data_blob_list_item { 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__) diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index f075075c02..b53f786618 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -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" diff --git a/source4/main.mk b/source4/main.mk index 613d76e0b9..a0fafec3a3 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -32,8 +32,7 @@ include scripting/ejs/config.mk 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) diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm index 7deb3ca331..31145e9fb3 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm @@ -382,7 +382,7 @@ sub Parse($) %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"; diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm index dfd219186f..c7fca95aaa 100644 --- a/source4/pidl/tests/Util.pm +++ b/source4/pidl/tests/Util.pm @@ -102,7 +102,7 @@ SKIP: { 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); |