From 3ecae818093cf02912c20a3177d5863a6a959ec8 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 16 Feb 2019 09:33:07 -0200 Subject: [PATCH] clutter/tests: Rename variable Graphene uses C99 and includes stdbool.h, which adds a new 'bool' type. Clutter has an a11y test that names a variable as 'bool' too, and they do not play well together. Rename this variable to boolean. https://gitlab.gnome.org/GNOME/mutter/merge_requests/458 --- .../accessibility/cally-atktext-example.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tests/clutter/accessibility/cally-atktext-example.c b/src/tests/clutter/accessibility/cally-atktext-example.c index 634a9a74f..fce36f1a4 100644 --- a/src/tests/clutter/accessibility/cally-atktext-example.c +++ b/src/tests/clutter/accessibility/cally-atktext-example.c @@ -40,7 +40,7 @@ test_atk_text (ClutterActor *actor) gchar *text = NULL; AtkObject *object = NULL; AtkText *cally_text = NULL; - gboolean bool = FALSE; + gboolean boolean = FALSE; gunichar unichar; gint count = -1; gint start = -1; @@ -89,17 +89,17 @@ test_atk_text (ClutterActor *actor) g_print ("atk_text_get_selection: %s, %i, %i\n", text, start, end); g_free(text); text = NULL; - bool = atk_text_remove_selection (cally_text, 0); - g_print ("atk_text_remove_selection (0): %i\n", bool); + boolean = atk_text_remove_selection (cally_text, 0); + g_print ("atk_text_remove_selection (0): %i\n", boolean); - bool = atk_text_remove_selection (cally_text, 1); - g_print ("atk_text_remove_selection (1): %i\n", bool); + boolean = atk_text_remove_selection (cally_text, 1); + g_print ("atk_text_remove_selection (1): %i\n", boolean); - bool = atk_text_add_selection (cally_text, 5, 10); - g_print ("atk_text_add_selection: %i\n", bool); + boolean = atk_text_add_selection (cally_text, 5, 10); + g_print ("atk_text_add_selection: %i\n", boolean); - bool = atk_text_set_selection (cally_text, 0, 6, 10); - g_print ("atk_text_set_selection: %i\n", bool); + boolean = atk_text_set_selection (cally_text, 0, 6, 10); + g_print ("atk_text_set_selection: %i\n", boolean); at_set = atk_text_get_run_attributes (cally_text, 0, &start, &end);