diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-23 21:35:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:09 -0500 |
| commit | 9b009c900987517359485799be8be4167494b376 (patch) | |
| tree | 32c4443eed39226209a70f28d08d5ef1937cc106 /source4/pidl | |
| parent | 6a3093d941da51ccd81600ed89771312ce4abe27 (diff) | |
| download | samba-9b009c900987517359485799be8be4167494b376.tar.gz samba-9b009c900987517359485799be8be4167494b376.tar.bz2 samba-9b009c900987517359485799be8be4167494b376.zip | |
r25301: Merge my includes.h cleanups.
(This used to be commit 37425495f392a2d0122a93aa2c42758eab7dab5a)
Diffstat (limited to 'source4/pidl')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/Header.pm | 1 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm index 071bec297c..75d4c235cb 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm +++ b/source4/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/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 9a29b72c1d..cd3981bb28 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/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")); } } |