diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-27 13:19:07 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-27 13:19:07 +0100 |
| commit | bc1a369a0ed254ede591b65756d75568c45549ea (patch) | |
| tree | 9c7fdefdc1d943506752d2d4e15cd4d81f65cc42 /source4/pidl | |
| parent | b3d2a56df29b163d93c4d20efc22c523441a92e5 (diff) | |
| parent | e20f1bb6dba342fcc91d3fcf28d64c7d5fd39a38 (diff) | |
| download | samba-bc1a369a0ed254ede591b65756d75568c45549ea.tar.gz samba-bc1a369a0ed254ede591b65756d75568c45549ea.tar.bz2 samba-bc1a369a0ed254ede591b65756d75568c45549ea.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit c45b97c4714dd0565949732394c9c1e8eedbb99a)
Diffstat (limited to 'source4/pidl')
| -rw-r--r-- | source4/pidl/idl.yp | 2 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/IDL.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/pidl/idl.yp b/source4/pidl/idl.yp index 028b628e18..c7ca0c7604 100644 --- a/source4/pidl/idl.yp +++ b/source4/pidl/idl.yp @@ -391,7 +391,7 @@ sub _Error { error($_[0]->YYData, $_[0]->YYData->{ERRMSG}); delete $_[0]->YYData->{ERRMSG}; return; - }; + } my $last_token = $_[0]->YYData->{LAST_TOKEN}; error($_[0]->YYData, "Syntax error near '$last_token'"); diff --git a/source4/pidl/lib/Parse/Pidl/IDL.pm b/source4/pidl/lib/Parse/Pidl/IDL.pm index aeee69e306..4adb4dcea8 100644 --- a/source4/pidl/lib/Parse/Pidl/IDL.pm +++ b/source4/pidl/lib/Parse/Pidl/IDL.pm @@ -2408,7 +2408,7 @@ sub _Error { error($_[0]->YYData, $_[0]->YYData->{ERRMSG}); delete $_[0]->YYData->{ERRMSG}; return; - }; + } my $last_token = $_[0]->YYData->{LAST_TOKEN}; error($_[0]->YYData, "Syntax error near '$last_token'"); |