From 8528016978b084213ef53d66e1b6e831b1a01acc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 16 Mar 2006 00:23:11 +0000
Subject: r14464: Don't include ndr_BASENAME.h files unless strictly required,
 instead try to include just the BASENAME.h files (containing only structs)
 (This used to be commit 3dd477ca5147f28a962b8437e2611a8222d706bd)

---
 source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 6 +++++-
 source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'source4/pidl')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 42375674f5..972368195b 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2239,10 +2239,14 @@ sub HeaderInterface($)
 
 	pidl_hdr "#include \"librpc/ndr/libndr.h\"";
 
+	if (has_property($interface, "object")) {
+		pidl "#include \"librpc/gen_ndr/ndr_orpc.h\"";
+	}
+
 	if (defined $interface->{PROPERTIES}->{depends}) {
 		my @d = split / /, $interface->{PROPERTIES}->{depends};
 		foreach my $i (@d) {
-			pidl_hdr "#include \"librpc/gen_ndr/ndr_$i\.h\"";
+			pidl "#include \"librpc/gen_ndr/ndr_$i\.h\"";
 		}
 	}
 
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index 8710f08cc7..fd6d303330 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -309,11 +309,11 @@ sub ParseInterface($)
 
 sub Parse($$)
 {
-	my($ndr) = shift;
-	my($filename) = shift;
+	my($ndr,$header) = @_;
 
 	$res =  "";
 	$res .= "/* server functions auto-generated by pidl */\n";
+	$res .= "#include \"$header\"\n";
 	$res .= "\n";
 
 	foreach my $x (@{$ndr}) {
-- 
cgit