[patch] glib-2.24.1-irix.patch

glib-2.24.1-irix.patch (text/plain), 1.74 KB, created by Stuart Shelton on 2010-06-30 15:28:39 UTC

--- glib/tests/gvariant.c.dist	2010-06-30 15:22:42.375941760 +0100
+++ glib/tests/gvariant.c	2010-06-30 15:27:15.145588320 +0100
@@ -2139,10 +2139,12 @@ check_tree (TreeInstance       *instance
     }
 }
 
+#ifdef __GNUC__
 static void
 serialise_tree (TreeInstance       *tree,
                 GVariantSerialised *serialised)
 {
+  /* The following is not C99-compliant */
   GVariantSerialised empty = {  };
 
   *serialised = empty;
@@ -2254,6 +2256,7 @@ test_fuzzes (gpointer data)
 
   g_variant_type_info_assert_no_infos ();
 }
+#endif
 
 static GVariant *
 tree_instance_get_gvariant (TreeInstance *tree)
@@ -3713,6 +3716,7 @@ main (int argc, char **argv)
   g_test_add_func ("/gvariant/serialiser/tuple", test_tuples);
   g_test_add_func ("/gvariant/serialiser/variant", test_variants);
   g_test_add_func ("/gvariant/serialiser/strings", test_strings);
+#ifdef __GNUC__
   g_test_add_func ("/gvariant/serialiser/byteswap", test_byteswaps);
 
   for (i = 1; i <= 20; i += 4)
@@ -3724,6 +3728,7 @@ main (int argc, char **argv)
                             (gpointer) test_fuzzes);
       g_free (testname);
     }
+#endif
 
   g_test_add_func ("/gvariant/containers", test_containers);
   g_test_add_func ("/gvariant/format-strings", test_format_strings);
--- ./gio/tests/memory-output-stream.c.dist	2010-06-30 15:44:54.600347600 +0100
+++ ./gio/tests/memory-output-stream.c	2010-06-30 16:12:45.407438560 +0100
@@ -115,7 +115,7 @@ test_properties (void)
   gpointer 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_assert_cmphex (data_fun, ==, data_prop);
+  g_assert_cmphex ((guint64)data_fun, ==, (guint64)data_prop);
 
   g_object_unref (o);
   g_object_unref (mo);