Fix build with gcc-2.*.

https://bugzilla.gnome.org/show_bug.cgi?id=650884

diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
index 5c2939e44a64080f58ca064397dce45511d595e0..a88df900f75742e7e0f95a39f9e15f1dcd9e5577 100644 (file)
--- a/gio/tests/gdbus-connection.c
+++ b/gio/tests/gdbus-connection.c
@@ -529,6 +529,8 @@ test_connection_signals (void)
   GError *error;
   gboolean ret;
   GVariant *result;
+  gboolean quit_mainloop_fired;
+  guint quit_mainloop_id;
 
   error = NULL;
 
@@ -686,8 +688,6 @@ test_connection_signals (void)
    * Also to check the total amount of NameOwnerChanged signals - use a 5 second ceiling
    * to avoid spinning forever
    */
-  gboolean quit_mainloop_fired;
-  guint quit_mainloop_id;
   quit_mainloop_fired = FALSE;
   quit_mainloop_id = g_timeout_add (30000, test_connection_quit_mainloop, &quit_mainloop_fired);
   while (count_name_owner_changed < 2 && !quit_mainloop_fired)

diff --git a/gio/tests/memory-output-stream.c b/gio/tests/memory-output-stream.c
index 210ad501da41d5547844b1ffb7d1918510b6cf13..01baaf5ab7144e3de9d7e04d764ab46d85caefa2 100644 (file)
--- a/gio/tests/memory-output-stream.c
+++ b/gio/tests/memory-output-stream.c
@@ -118,6 +118,10 @@ test_properties (void)
   GDataOutputStream *o;
   int i;
   GError *error = NULL;
+  gsize data_size_fun;
+  gsize data_size_prop;
+  gpointer data_fun;
+  gpointer data_prop;
 
   g_test_bug ("605733");
 
@@ -133,13 +137,11 @@ test_properties (void)
       g_assert_no_error (error);
     }
 
-  gsize data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
-  gsize data_size_prop;
+  data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
   g_object_get (mo, "data-size", &data_size_prop, NULL);
   g_assert_cmpint (data_size_fun, ==, data_size_prop);
 
-  gpointer data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
-  gpointer data_prop;
+  data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
   g_object_get (mo, "data", &data_prop, NULL);
   g_assert_cmphex (GPOINTER_TO_SIZE (data_fun), ==, GPOINTER_TO_SIZE (data_prop));