Fix a C99ism

svn path=/trunk/; revision=5670

diff --git a/ChangeLog b/ChangeLog
index 9fd6b61c1c6b49ca5a93ec4d52feb360cf5679af..05c50a780e29c5f478b14e8ed50aed76ed9c747f 100644 (file)
--- 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 32b8b2d3f6a8315a7b5bfc3bff9a7c1896e8d6b4..4f5e9eb4053bf4ba43b70b3df34a9b5d948a6cc2 100644 (file)
--- 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,