From f91008deb7d88d6c8af473361dcc10644c330096 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 Aug 2005 18:29:51 +0000
Subject: r8932: Handle non-anonymous unions and structures better. (This used
 to be commit 04f993721574b4532962b5845faa4cb40a90ca38)

---
 source4/build/pidl/smb_interfaces.yp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/pidl/smb_interfaces.yp b/source4/build/pidl/smb_interfaces.yp
index bfb5dc7ed7..f8c34eacdc 100644
--- a/source4/build/pidl/smb_interfaces.yp
+++ b/source4/build/pidl/smb_interfaces.yp
@@ -24,9 +24,9 @@ definition:
 
 struct: STRUCT optional_identifier '{' elements '}' pointers optional_identifiers ';'
 	{
-		my $name = defined($_[2]) ? $_[2] : $_[7];
 		{
-			"NAME" => $name,
+			"NAME" => $_[7],
+			"STRUCT_NAME" => $_[2],
 			"TYPE" => "struct",
 			"DATA" => $_[4],
 		}
@@ -36,9 +36,9 @@ struct: STRUCT optional_identifier '{' elements '}' pointers optional_identifier
 union:
 	UNION optional_identifier '{' elements '}' pointers optional_identifier ';'
 	{
-		my $name = defined($_[2]) ? $_[2] : $_[7];
 		{
-			"NAME" => $name,
+			"NAME" => $_[7],
+			"UNION_NAME" => $_[2],
 			"TYPE" => "union",
 			"DATA" => $_[4],
 		}
-- 
cgit