X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-spawn-pipe-child.c;h=ee73c83c50bb8e49253b75c19540d43a0c7dad99;hb=b8c5e24996c9626f03890cd986fc1fb7b17fa610;hp=0bc8b07c5e755f1f75611e7adfec9b324fa2e07f;hpb=13bba66f5fbbaf0dc453994a36747732ae786e02;p=gnulib.git

diff --git a/tests/test-spawn-pipe-child.c b/tests/test-spawn-pipe-child.c
index 0bc8b07c5..ee73c83c5 100644
--- a/tests/test-spawn-pipe-child.c
+++ b/tests/test-spawn-pipe-child.c
@@ -1,5 +1,5 @@
 /* Child program invoked by test-spawn-pipe-main.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the Win32 API functions.  */
+/* Get declarations of the native Windows API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -45,6 +45,8 @@ static FILE *myerr;
 #undef close
 #undef fcntl
 #undef fdopen
+#undef fflush
+#undef fprintf
 #undef read
 #undef write
 
@@ -53,7 +55,7 @@ static int
 is_open (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On Win32, the initial state of unassigned standard file
+  /* On native Windows, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;