--- cairo/test/cairo-test.c.orig	Wed May  4 08:06:50 2005
+++ cairo/test/cairo-test.c	Wed May  4 08:07:48 2005
@@ -326,7 +326,7 @@
 cairo_test_real (cairo_test_t *test, cairo_test_draw_function_t draw)
 {
     int i;
-    FILE *stderr_saved = stderr;
+    FILE *Stderr;
     cairo_test_status_t status, ret;
     cairo_test_target_t targets[] = 
 	{
@@ -352,12 +352,12 @@
     xasprintf (&log_name, "%s%s", test->name, CAIRO_TEST_LOG_SUFFIX);
     xunlink (log_name);
 
-    stderr = fopen (log_name, "a");
+    Stderr = fopen (log_name, "a");
 
     ret = CAIRO_TEST_SUCCESS;
     for (i=0; i < sizeof(targets)/sizeof(targets[0]); i++) {
 	cairo_test_target_t *target = &targets[i];
-	fprintf (stderr, "Testing %s with %s target\n", test->name, target->name);
+	fprintf (Stderr, "Testing %s with %s target\n", test->name, target->name);
 	printf ("%s_%s:\t", test->name, target->name);
 	status = cairo_test_for_target (test, draw, target);
 	if (status) {
@@ -368,8 +368,7 @@
 	}
     }
 
-    fclose (stderr);
-    stderr = stderr_saved;
+    fclose (Stderr);
 
     return ret;
 }