2005-10-03  Matthias Clasen  <mclasen@redhat.com>

	* glib-mkenums.in: Really fix #314890.
This commit is contained in:
Matthias Clasen 2005-10-03 15:46:15 +00:00 committed by Matthias Clasen
parent c83e2b3349
commit 12e2c276b5
2 changed files with 6 additions and 2 deletions

View File

@ -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> 2005-09-28 Michael Natterer <mitch@gimp.org>
* gtype.h (G_IMPLEMENT_INTERFACE): revert last change, it breaks * gtype.h (G_IMPLEMENT_INTERFACE): revert last change, it breaks

View File

@ -267,7 +267,7 @@ while (<>) {
(?:/\*< (?:/\*<
(([^*]|\*(?!/))*) (([^*]|\*(?!/))*)
>\s*\*/)? >\s*\*/)?
({)? \s*({)?
@x) { @x) {
if (defined $2) { if (defined $2) {
my %options = parse_trigraph ($2); my %options = parse_trigraph ($2);
@ -281,7 +281,7 @@ while (<>) {
$option_lowercase_name = undef; $option_lowercase_name = undef;
} }
# Didn't have trailing '{' look on next lines # Didn't have trailing '{' look on next lines
if (!defined $1 && !defined $3) { if (!defined $1 && !defined $4) {
while (<>) { while (<>) {
if (s/^\s*\{//) { if (s/^\s*\{//) {
last; last;