diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2007-09-24 16:05:51 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2007-09-24 16:05:51 +0000 |
| commit | af5de71e06a5f57ca03ea747131ab1bcac88c0c2 (patch) | |
| tree | ef95e1180b0bf3729f7ef8dc5269c7d29b61e773 /tools/pidl | |
| parent | 0cb93f22ba6df8ed03c66e72db7f8ddac0b085f0 (diff) | |
Update from samba tree revision 25198 to 25306
============================ Samba log start ============
------------------------------------------------------------------------
r25301 | jelmer | 2007-09-23 23:35:03 +0200 (Sun, 23 Sep 2007) | 1 line
A /branches/SAMBA_4_0/source/libcli/raw/clierror.c (from /branches/SAMBA_4_0/source/libcli/util/clierror.c:25300)
D /branches/SAMBA_4_0/source/libcli/util/clierror.c
D /branches/SAMBA_4_0/source/libcli/util/nt_status.h
D /branches/SAMBA_4_0/source/libcli/util/nterr.h
A /branches/SAMBA_4_0/source/libcli/util/ntstatus.h (from /branches/SAMBA_4_0/source/libcli/util/nterr.h:25300)
A /branches/SAMBA_4_0/source/libcli/util/werror.h (from /branches/SAMBA_4_0/source/libcli/util/nt_status.h:25300)
Merge my includes.h cleanups.
------------------------------------------------------------------------
------------------------------------------------------------------------
============================ Samba log end ==============
svn path=/trunk/; revision=22939
Diffstat (limited to 'tools/pidl')
| -rw-r--r-- | tools/pidl/lib/Parse/Pidl/Samba4/Header.pm | 1 | ||||
| -rw-r--r-- | tools/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/pidl/lib/Parse/Pidl/Samba4/Header.pm b/tools/pidl/lib/Parse/Pidl/Samba4/Header.pm index 071bec297c..75d4c235cb 100644 --- a/tools/pidl/lib/Parse/Pidl/Samba4/Header.pm +++ b/tools/pidl/lib/Parse/Pidl/Samba4/Header.pm @@ -390,7 +390,6 @@ sub Parse($) pidl "/* header auto-generated by pidl */\n\n"; if (!is_intree()) { pidl "#include <util/data_blob.h>\n"; - pidl "#include <gen_ndr/misc.h>\n"; } pidl "#include <stdint.h>\n"; pidl "\n"; diff --git a/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 9a29b72c1d..cd3981bb28 100644 --- a/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -2597,7 +2597,7 @@ sub GenerateIncludes($) # Samba3 has everything in include/includes.h if (is_intree() != 3) { - $self->pidl(choose_header("libcli/util/nterr.h", "core/nterr.h")); + $self->pidl(choose_header("libcli/util/ntstatus.h", "core/ntstatus.h")); $self->pidl(choose_header("librpc/gen_ndr/ndr_misc.h", "gen_ndr/ndr_misc.h")); } } |