summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2020-06-25 10:20:40 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2020-06-25 10:20:40 +0000
commit07c21d16be9cefbfbf82d357aab6896932d1f610 (patch)
treeccc14a4defc5c8a29d3c4afa67f713b4ef4071b1
parent9aaef112566c121d2660445ee9d06d13846d68f6 (diff)
parent9c2a63ae5be02205714a84bbf8a5645ff926ab90 (diff)
downloadpango-07c21d16be9cefbfbf82d357aab6896932d1f610.tar.gz
Merge branch 'fix-pre-c99' into 'master'
pango-attributes.c: Fix on older compilers See merge request GNOME/pango!208
-rw-r--r--pango/pango-attributes.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index 218ffade..5f844639 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -1868,6 +1868,7 @@ pango_attr_list_equal (PangoAttrList *list,
{
GPtrArray *attrs, *other_attrs;
guint64 skip_bitmask = 0;
+ guint i;
if (list == other_list)
return TRUE;
@@ -1884,12 +1885,13 @@ pango_attr_list_equal (PangoAttrList *list,
if (attrs->len != other_attrs->len)
return FALSE;
- for (guint i = 0; i < attrs->len; i++)
+ for (i = 0; i < attrs->len; i++)
{
PangoAttribute *attr = g_ptr_array_index (attrs, i);
gboolean attr_equal = FALSE;
+ guint other_attr_index;
- for (guint other_attr_index = 0; other_attr_index < other_attrs->len; other_attr_index++)
+ for (other_attr_index = 0; other_attr_index < other_attrs->len; other_attr_index++)
{
PangoAttribute *other_attr = g_ptr_array_index (other_attrs, other_attr_index);
guint64 other_attr_bitmask = other_attr_index < 64 ? 1 << other_attr_index : 0;