callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add braces to appease gcc

Browse Source 
-ftrack-macro-expansion=0 doesn't like if statements without braces when
evaluating indentation levels.
This commit is contained in:
Benjamin Otte
2016-08-25 23:01:28 +02:00
parent c8b301f1ea
commit 35c96c2c1f
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkcomposetable.c
View File

@ -573,7 +573,9 @@ gtk_compose_table_serialize (GtkComposeTable *compose_table,
(long long) (p - contents), total_length); \ (long long) (p - contents), total_length); \
g_free (contents); \ g_free (contents); \
if (count) \ if (count) \
*count = 0; \ { \
*count = 0; \
} \
return NULL; \ return NULL; \
} }

12
gtk/gtkcssselector.c
View File

@ -507,11 +507,17 @@ gtk_css_selector_ ## n ## _add_specificity (const GtkCssSelector *selector, \
guint *elements) \ guint *elements) \
{ \ { \
if (increase_id_specificity) \ if (increase_id_specificity) \
(*ids)++; \ { \
(*ids)++; \
} \
if (increase_class_specificity) \ if (increase_class_specificity) \
(*classes)++; \ { \
(*classes)++; \
} \
if (increase_element_specificity) \ if (increase_element_specificity) \
(*elements)++; \ { \
(*elements)++; \
} \
} \ } \
\ \
static const GtkCssSelectorClass GTK_CSS_SELECTOR_ ## c = { \ static const GtkCssSelectorClass GTK_CSS_SELECTOR_ ## c = { \

6
gtk/gtksizerequest.c
View File

@ -351,8 +351,10 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
: "height for width", : "height for width",
for_size, min_size, nat_size); for_size, min_size, nat_size);
if (min_baseline != -1 || nat_baseline != -1) if (min_baseline != -1 || nat_baseline != -1)
g_string_append_printf (s, ", baseline %d/%d", {
min_baseline, nat_baseline); g_string_append_printf (s, ", baseline %d/%d",
min_baseline, nat_baseline);
}
g_string_append_printf (s, " (hit cache: %s)\n", g_string_append_printf (s, " (hit cache: %s)\n",
found_in_cache ? "yes" : "no"); found_in_cache ? "yes" : "no");
g_message ("%s", s->str); g_message ("%s", s->str);