Revert "TODO pidl/IDL: give anonymous structs and unions a name..."

This reverts commit da001b7398fbf4890a9525aac016a5362f39be82.

Conflicts:

	pidl/lib/Parse/Pidl/IDL.pm

diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index 6927c892556b8bc6f5d174091b7e5c45d140b77e..3ed71d471a45508bceec509ee638b1370b6cd8bb 100644 (file)
--- a/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
@@ -2491,7 +2491,11 @@ sub
        [#Rule 120
                 'text', 1,
 sub
+<<<<<<< HEAD
 #line 531 "idl.yp"
+=======
+#line 507 "idl.yp"
+>>>>>>> 09da6c7... Revert "TODO pidl/IDL: give anonymous structs and unions a name..."
 { "\"$_[1]\"" }
        ],
        [#Rule 121
@@ -2505,7 +2509,11 @@ sub
     bless($self,$class);
 }
 
+<<<<<<< HEAD
 #line 543 "idl.yp"
+=======
+#line 519 "idl.yp"
+>>>>>>> 09da6c7... Revert "TODO pidl/IDL: give anonymous structs and unions a name..."
 
 
 use Parse::Pidl qw(error);