From 82ed0866182afa6b8a2285f46bdd8f326db9032f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 6 Sep 2006 22:08:06 +0000 Subject: r18193: Not quite to autogenerated NDR but closer thanks to Jelmer's initial work. I'm including the librpc/gen_ndr directory in svn temporarily just to get some compile issues straightened out. (This used to be commit cf271aa433cfa606be5dbf3ed1d94fe3caf57653) --- source3/include/core.h | 3 +++ source3/include/core/nterr.h | 1 + source3/include/dcerpc.h | 0 source3/include/includes.h | 3 ++- source3/include/ndr.h | 1 + source3/include/smb.h | 4 ++-- 6 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 source3/include/core.h create mode 100644 source3/include/core/nterr.h create mode 100644 source3/include/dcerpc.h create mode 100644 source3/include/ndr.h (limited to 'source3/include') diff --git a/source3/include/core.h b/source3/include/core.h new file mode 100644 index 0000000000..1f9ddb8b3c --- /dev/null +++ b/source3/include/core.h @@ -0,0 +1,3 @@ +/* dummy file to deal with pidl autogenerated ndr files */ + +#include "nterr.h" diff --git a/source3/include/core/nterr.h b/source3/include/core/nterr.h new file mode 100644 index 0000000000..c56735e772 --- /dev/null +++ b/source3/include/core/nterr.h @@ -0,0 +1 @@ +#include "includes.h" diff --git a/source3/include/dcerpc.h b/source3/include/dcerpc.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/source3/include/includes.h b/source3/include/includes.h index 35dd37748a..ab85c0e75e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1000,7 +1000,8 @@ extern int errno; #include "rpc_client.h" #include "event.h" -#include "libndr/libndr.h" +#include "librpc/ndr/libndr.h" +#include "librpc/gen_ndr/unixinfo.h" /* * Type for wide character dirent structure. diff --git a/source3/include/ndr.h b/source3/include/ndr.h new file mode 100644 index 0000000000..a416866ef2 --- /dev/null +++ b/source3/include/ndr.h @@ -0,0 +1 @@ +/* dummy file to deal with pidl autogenerated ndr files */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 741b4a9d53..6bc8680f86 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -287,8 +287,8 @@ typedef struct dom_sid { uint32 sub_auths[MAXSUBAUTHS]; } DOM_SID; -#include "libndr/misc.h" -#include "libndr/security.h" +#include "librpc/ndr/misc.h" +#include "librpc/ndr/security.h" struct lsa_dom_info { BOOL valid; -- cgit