X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffflush.m4;h=f74a1f842f0cf49db27223837d93f24e63b49637;hb=0ac9362d3e63ada72bef1cb93bb20ef5b9d01e44;hp=29ef61394dc15eadaaaca1e995cb3c8e37a2c80d;hpb=5d9f4218b61b9c279b32a6572f21f260b38a05e8;p=gnulib.git

diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 29ef61394..f74a1f842 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,4 +1,4 @@
-# fflush.m4 serial 10
+# fflush.m4 serial 13
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -12,10 +12,10 @@ dnl unread input on seekable streams, rather than C99 undefined semantics.
 
 AC_DEFUN([gl_FUNC_FFLUSH],
 [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   gl_FUNC_FFLUSH_STDIN
   if test $gl_cv_func_fflush_stdin = no; then
-    gl_REPLACE_FFLUSH
-    gl_REPLACE_FCLOSE
+    REPLACE_FFLUSH=1
   fi
 ])
 
@@ -24,13 +24,18 @@ dnl Sets gl_cv_func_fflush_stdin.
 
 AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
 [
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([whether fflush works on input streams],
     [gl_cv_func_fflush_stdin],
     [echo hello world > conftest.txt
      AC_RUN_IFELSE([AC_LANG_PROGRAM(
        [[
 #include <stdio.h>
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#else /* on Windows with MSVC */
+# include <io.h>
+#endif
        ]], [[FILE *f = fopen ("conftest.txt", "r");
          char buffer[10];
          int fd;
@@ -73,14 +78,6 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
     ])
 ])
 
-AC_DEFUN([gl_REPLACE_FFLUSH],
-[
-  AC_LIBOBJ([fflush])
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  REPLACE_FFLUSH=1
-  gl_PREREQ_FFLUSH
-])
-
 # Prerequisites of lib/fflush.c.
 AC_DEFUN([gl_PREREQ_FFLUSH],
 [