libsoup r1064 - in trunk: . tests

[danw svn gnome org]

Author: danw
Date: Fri Feb  1 15:28:19 2008
New Revision: 1064
URL: http://svn.gnome.org/viewvc/libsoup?rev=1064&view=rev

Log:
	* tests/query-test.c (do_test): don't use "stdout" as a variable
	name; it's allowed to be a macro  (and it is one on Solaris).
	#513602, patch from Jeff Cai.


Modified:
   trunk/ChangeLog
   trunk/tests/query-test.c

Modified: trunk/tests/query-test.c
==============================================================================
--- trunk/tests/query-test.c	(original)
+++ trunk/tests/query-test.c	Fri Feb  1 15:28:19 2008
@@ -61,7 +61,7 @@
 {
 	GPtrArray *args;
 	char *title_arg = NULL, *name_arg = NULL;
-	char *stdout = NULL;
+	char *str_stdout = NULL;
 
 	debug_printf (1, "%2d. '%s' '%s'%s: ", n * 2 + (extra ? 2 : 1),
 		      tests[n].title ? tests[n].title : "(null)",
@@ -91,17 +91,17 @@
 	if (g_spawn_sync (NULL, (char **)args->pdata, NULL,
 			  G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
 			  NULL, NULL,
-			  &stdout, NULL, NULL, NULL)) {
-		if (stdout && !strcmp (stdout, tests[n].result))
+			  &str_stdout, NULL, NULL, NULL)) {
+		if (str_stdout && !strcmp (str_stdout, tests[n].result))
 			debug_printf (1, "OK!\n");
 		else {
 			debug_printf (1, "WRONG!\n");
 			debug_printf (1, "  expected '%s', got '%s'\n",
 				      tests[n].result,
-				      stdout ? stdout : "(error)");
+				      str_stdout ? str_stdout : "(error)");
 			errors++;
 		}
-		g_free (stdout);
+		g_free (str_stdout);
 	} else {
 		debug_printf (1, "ERROR!\n");
 		errors++;