From 9b009c900987517359485799be8be4167494b376 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Sep 2007 21:35:03 +0000
Subject: r25301: Merge my includes.h cleanups. (This used to be commit
 37425495f392a2d0122a93aa2c42758eab7dab5a)

---
 source4/pidl/lib/Parse/Pidl/Samba4/Header.pm     | 1 -
 source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/pidl/lib/Parse')

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"));
 	}
 }
-- 
cgit