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 ==============

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22939 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/tools/pidl/lib/Parse/Pidl/Samba4/Header.pm b/tools/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 071bec297ce4534f27ab0a86dabb83e351db87f5..75d4c235cb4203d8ce1a6acd8af543264f921524 100644 (file)
--- 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 9a29b72c1d89b570db572a210bf6d4004eb9ea32..cd3981bb282e9b6d17d4e971fde6421776d0e1bd 100644 (file)
--- 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"));
        }
 }