luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 22:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build with gcc-2.*.

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=650884
This commit is contained in:
Antoine Jacoutot 2011-05-23 19:11:10 +02:00 committed by Colin Walters
parent c61fd66e77
commit ce0f7cafa1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/tests/gdbus-connection.c
View File

@ -529,6 +529,8 @@ test_connection_signals (void)
GError *error; GError *error;
gboolean ret; gboolean ret;
GVariant *result; GVariant *result;
gboolean quit_mainloop_fired;
guint quit_mainloop_id;
error = NULL; error = NULL;
@ -686,8 +688,6 @@ test_connection_signals (void)
* Also to check the total amount of NameOwnerChanged signals - use a 5 second ceiling * Also to check the total amount of NameOwnerChanged signals - use a 5 second ceiling
* to avoid spinning forever * to avoid spinning forever
*/ */
gboolean quit_mainloop_fired;
guint quit_mainloop_id;
quit_mainloop_fired = FALSE; quit_mainloop_fired = FALSE;
quit_mainloop_id = g_timeout_add (30000, test_connection_quit_mainloop, &quit_mainloop_fired); quit_mainloop_id = g_timeout_add (30000, test_connection_quit_mainloop, &quit_mainloop_fired);
while (count_name_owner_changed < 2 && !quit_mainloop_fired) while (count_name_owner_changed < 2 && !quit_mainloop_fired)

10
gio/tests/memory-output-stream.c
View File

@ -118,6 +118,10 @@ test_properties (void)
GDataOutputStream *o; GDataOutputStream *o;
int i; int i;
GError *error = NULL; GError *error = NULL;
gsize data_size_fun;
gsize data_size_prop;
gpointer data_fun;
gpointer data_prop;
g_test_bug ("605733"); g_test_bug ("605733");
@ -133,13 +137,11 @@ test_properties (void)
g_assert_no_error (error); g_assert_no_error (error);
} }
gsize data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo)); data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
gsize data_size_prop;
g_object_get (mo, "data-size", &data_size_prop, NULL); g_object_get (mo, "data-size", &data_size_prop, NULL);
g_assert_cmpint (data_size_fun, ==, data_size_prop); g_assert_cmpint (data_size_fun, ==, data_size_prop);
gpointer data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo)); data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
gpointer data_prop;
g_object_get (mo, "data", &data_prop, NULL); g_object_get (mo, "data", &data_prop, NULL);
g_assert_cmphex (GPOINTER_TO_SIZE (data_fun), ==, GPOINTER_TO_SIZE (data_prop)); g_assert_cmphex (GPOINTER_TO_SIZE (data_fun), ==, GPOINTER_TO_SIZE (data_prop));