e336dd0283
Joint work with upstream.
37 lines
1.3 KiB
Plaintext
37 lines
1.3 KiB
Plaintext
$OpenBSD: patch-gio_tests_memory-output-stream_c,v 1.3 2011/05/28 07:32:06 ajacoutot Exp $
|
|
|
|
From ce0f7cafa1746a94f90b74860c2890b6c18ca385 Mon Sep 17 00:00:00 2001
|
|
From: Antoine Jacoutot <ajacoutot@bsdfrog.org>
|
|
Date: Mon, 23 May 2011 17:11:10 +0000
|
|
Subject: Fix build with gcc-2.*.
|
|
|
|
--- gio/tests/memory-output-stream.c.orig Mon Aug 9 15:34:46 2010
|
|
+++ gio/tests/memory-output-stream.c Mon Sep 27 14:42:36 2010
|
|
@@ -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));
|
|
|