From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 26 Sep 2005 15:19:24 +0000 (+0000)
Subject: Don't hang on '{' following a trigraph comment in the same line. (#314890,
X-Git-Tag: GLIB_2_9_0~51
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2b2c8143f10e3f7581d6cbf8ea039afc70db388;p=platform%2Fupstream%2Fglib.git

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)
---

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 60b7f8e..ea9a01a 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)
+
 Thu Sep 22 12:42:12 2005  Tim Janik  <timj@gtk.org>
 
 	* gparam.c (g_param_spec_internal): fix pspec->name assignment which
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index 6782e0b..f4bf92c 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;