From 94793b80d7fbd6121bb30e36b25e63abe078feee Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 25 Dec 2005 17:12:52 +0000
Subject: r12484: Initial work on supporting non-typedeffed types (This used to
 be commit e7ac6c708dde7afb4c92a8cc4dea7a95b7054e3e)

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

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

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index f5aea73d12..8c576c44f9 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -706,7 +706,7 @@ sub EjsInterface($$)
 
 	%constants = ();
 
-	foreach my $d (@{$interface->{TYPEDEFS}}) {
+	foreach my $d (@{$interface->{TYPES}}) {
 		($needed->{"push_$d->{NAME}"}) && EjsTypedefPush($d);
 		($needed->{"pull_$d->{NAME}"}) && EjsTypedefPull($d);
 	}
@@ -831,7 +831,7 @@ sub NeededInterface($$)
 	foreach my $d (@{$interface->{FUNCTIONS}}) {
 	    NeededFunction($d, $needed);
 	}
-	foreach my $d (reverse @{$interface->{TYPEDEFS}}) {
+	foreach my $d (reverse @{$interface->{TYPES}}) {
 	    NeededTypedef($d, $needed);
 	}
 }
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm
index a204ee7a56..eae7ddce5f 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJSHeader.pm
@@ -54,9 +54,7 @@ sub HeaderInterface($)
 
 	pidl "\n";
 
-	foreach my $d (@{$interface->{TYPEDEFS}}) {
-		HeaderTypedefProto($d);
-	}
+	HeaderTypedefProto($_) foreach (@{$interface->{TYPES}});
 
 	pidl "\n";
 	pidl "#endif /* _HEADER_EJS_$interface->{NAME} */\n";
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 2242323747..bb9d32487a 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2313,7 +2313,7 @@ sub ParseInterface($$)
 	HeaderInterface($interface);
 
 	# Typedefs
-	foreach my $d (@{$interface->{TYPEDEFS}}) {
+	foreach my $d (@{$interface->{TYPES}}) {
 		($needed->{"push_$d->{NAME}"}) && ParseTypedefPush($d);
 		($needed->{"pull_$d->{NAME}"}) && ParseTypedefPull($d);
 		($needed->{"print_$d->{NAME}"}) && ParseTypedefPrint($d);
@@ -2456,7 +2456,7 @@ sub NeededInterface($$)
 {
 	my ($interface,$needed) = @_;
 	NeededFunction($_, $needed) foreach (@{$interface->{FUNCTIONS}});
-	NeededTypedef($_, $needed) foreach (reverse @{$interface->{TYPEDEFS}});
+	NeededTypedef($_, $needed) foreach (reverse @{$interface->{TYPES}});
 }
 
 1;
-- 
cgit