Fix a C99ism

svn path=/trunk/; revision=5670
This commit is contained in:
Matthias Clasen 2007-08-03 18:13:56 +00:00
parent d9ef72e4e9
commit daa4a93583
2 changed files with 7 additions and 1 deletions

View File

@ -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> 2007-08-03 Matthias Clasen <mclasen@redhat.com>
* glib/gregex.c: Handle J changes in the pattern * glib/gregex.c: Handle J changes in the pattern

View File

@ -296,11 +296,13 @@ gboolean
g_match_info_next (GMatchInfo *match_info, g_match_info_next (GMatchInfo *match_info,
GError **error) GError **error)
{ {
gint opts;
g_return_val_if_fail (match_info != NULL, FALSE); g_return_val_if_fail (match_info != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (match_info->pos >= 0, 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->matches = pcre_exec (match_info->regex->pcre_re,
match_info->regex->extra, match_info->regex->extra,