git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a74b768
)
Revert "Revert "TODO pidl/IDL: give anonymous structs and unions a name...""
author
Stefan Metzmacher
<metze@samba.org>
Tue, 5 Oct 2010 06:12:48 +0000
(08:12 +0200)
committer
Stefan Metzmacher
<metze@samba.org>
Tue, 4 Jun 2019 11:14:55 +0000
(13:14 +0200)
This reverts commit
cc66e11215463f4597126a7f4c5b48e143cb773f
.
pidl/lib/Parse/Pidl/IDL.pm
patch
|
blob
|
history
diff --git
a/pidl/lib/Parse/Pidl/IDL.pm
b/pidl/lib/Parse/Pidl/IDL.pm
index 3ed71d471a45508bceec509ee638b1370b6cd8bb..6927c892556b8bc6f5d174091b7e5c45d140b77e 100644
(file)
--- a/
pidl/lib/Parse/Pidl/IDL.pm
+++ b/
pidl/lib/Parse/Pidl/IDL.pm
@@
-2491,11
+2491,7
@@
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
@@
-2509,11
+2505,7
@@
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);