diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-09-26 15:20:41 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-09-26 15:20:41 +0000 |
| commit | aef922732e264d279c3312a3d76d974f27427b2d (patch) | |
| tree | 3b42212b69889d09ebbb38cb5fe0e22fd2e68162 | |
| parent | 3f6d15d15b06a34233bffbaaa6469e7499594ab4 (diff) | |
| download | glib-aef922732e264d279c3312a3d76d974f27427b2d.tar.gz | |
Don't hang on '{' following a trigraph comment in the same line. (#314890,
2005-09-26 Matthias Clasen <mclasen@redhat.com>
* glib-mkenums.in: Don't hang on '{' following a trigraph comment
in the same line. (#314890, Mathias Hasselmann)
| -rw-r--r-- | gobject/ChangeLog | 5 | ||||
| -rwxr-xr-x | gobject/glib-mkenums.in | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog index b495083dd..acdddb9e5 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +2005-09-26 Matthias Clasen <mclasen@redhat.com> + + * glib-mkenums.in: Don't hang on '{' following a trigraph comment + in the same line. (#314890, Mathias Hasselmann) + 2005-08-23 Matthias Clasen <mclasen@redhat.com> * === Released 2.8.1 === diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in index 6782e0b79..f4bf92c47 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -267,6 +267,7 @@ while (<>) { (?:/\*< (([^*]|\*(?!/))*) >\s*\*/)? + ({)? @x) { if (defined $2) { my %options = parse_trigraph ($2); @@ -280,7 +281,7 @@ while (<>) { $option_lowercase_name = undef; } # Didn't have trailing '{' look on next lines - if (!defined $1) { + if (!defined $1 && !defined $3) { while (<>) { if (s/^\s*\{//) { last; |