r25453: Fix include for NTSTATUS.

(This used to be commit 3c2d06d8fc8783362a6ff934e86ea4a4da2c6906)

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index cf14b645a97b72ea8c18a9755847b2f3012681c8..e9c158e93323b93152e7df011f91ad98a7a2cd78 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -109,7 +109,7 @@ sub Parse($$$$)
                $res .= "#include <stdlib.h>\n";
                $res .= "#include <stdint.h>\n";
                $res .= "#include <stdarg.h>\n";
-               $res .= "#include <core/nterr.h>\n";
+               $res .= "#include <core/ntstatus.h>\n";
        }
        $res .= "#include \"$ndr_header\"\n";
        $res .= "#include \"$client_header\"\n";

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm
index 832a2c5463e64e0a009ab355661b4c5e29516c62..568dff5adf541a54b05b29270b12f1e32ea2db91 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm
@@ -265,7 +265,7 @@ sub Parser($$$$)
                $self->pidl("#include <stdint.h>");
                $self->pidl("#include <stdarg.h>");
                $self->pidl("#include <string.h>");
-               $self->pidl("#include <core/nterr.h>");
+               $self->pidl("#include <core/ntstatus.h>");
        }
        $self->pidl("#include \"$hdrname\"");
        $self->pidl("");

diff --git a/source4/pidl/tests/ndr_represent.pl b/source4/pidl/tests/ndr_represent.pl
index 52cd06f8170f4a12e810d4749d20af7e109a95a7..84feeeb9ff2ad55141000b055fe31ebf005f00c6 100755 (executable)
--- a/source4/pidl/tests/ndr_represent.pl
+++ b/source4/pidl/tests/ndr_represent.pl
@@ -25,7 +25,7 @@ test_samba4_ndr('represent_as-simple',
                return 2;
 ',
 '
-#include <libcli/util/nterr.h>
+#include <libcli/util/ntstatus.h>
 
 NTSTATUS ndr_uint8_to_uint32(uint8_t from, uint32_t *to)
 {
@@ -58,7 +58,7 @@ test_samba4_ndr('transmit_as-simple',
                return 2;
 ',
 '
-#include <libcli/util/nterr.h>
+#include <libcli/util/ntstatus.h>
 
 NTSTATUS ndr_uint8_to_uint32(uint8_t from, uint32_t *to)
 {