From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Fri, 3 Aug 2007 18:13:56 +0000 (+0000)
Subject: Fix a C99ism
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=daa4a9358374b178d86fd2fd0d285c2f9bbfbe09;p=dana%2Fcg-glib.git

Fix a C99ism

svn path=/trunk/; revision=5670
---

diff --git a/ChangeLog b/ChangeLog
index 9fd6b61c..05c50a78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gregex.c: Fix a C99ism.  (#462549, Kazuki IWAMOTO)
+
 2007-08-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gregex.c: Handle J changes in the pattern
diff --git a/glib/gregex.c b/glib/gregex.c
index 32b8b2d3..4f5e9eb4 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -296,11 +296,13 @@ gboolean
 g_match_info_next (GMatchInfo  *match_info,
 		   GError     **error)
 {
+  gint opts;
+
   g_return_val_if_fail (match_info != NULL, FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
   g_return_val_if_fail (match_info->pos >= 0, FALSE);
 
-  gint opts = match_info->regex->match_opts | match_info->match_opts;
+  opts = match_info->regex->match_opts | match_info->match_opts;
  
   match_info->matches = pcre_exec (match_info->regex->pcre_re,
 				   match_info->regex->extra,