diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-10-03 15:46:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-10-03 15:46:15 +0000 |
| commit | 12e2c276b53538532398a4f53f60a317979123c5 (patch) | |
| tree | 8e961133cd772a5f12a3c1d21fed67dfcf8ac796 | |
| parent | c83e2b3349cbebe693a658d2b2bbef9c400e98b9 (diff) | |
| download | glib-12e2c276b53538532398a4f53f60a317979123c5.tar.gz | |
Really fix #314890.
2005-10-03 Matthias Clasen <mclasen@redhat.com>
* glib-mkenums.in: Really fix #314890.
| -rw-r--r-- | gobject/ChangeLog | 4 | ||||
| -rwxr-xr-x | gobject/glib-mkenums.in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 07dddb91d..6fade6f19 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +2005-10-03 Matthias Clasen <mclasen@redhat.com> + + * glib-mkenums.in: Really fix #314890. + 2005-09-28 Michael Natterer <mitch@gimp.org> * gtype.h (G_IMPLEMENT_INTERFACE): revert last change, it breaks diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in index f4bf92c47..bce03ad3e 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -267,7 +267,7 @@ while (<>) { (?:/\*< (([^*]|\*(?!/))*) >\s*\*/)? - ({)? + \s*({)? @x) { if (defined $2) { my %options = parse_trigraph ($2); @@ -281,7 +281,7 @@ while (<>) { $option_lowercase_name = undef; } # Didn't have trailing '{' look on next lines - if (!defined $1 && !defined $3) { + if (!defined $1 && !defined $4) { while (<>) { if (s/^\s*\{//) { last; |