X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffflush.m4;h=6df51736812529ac17c0a223d1b4a535fd1a9745;hb=da8054d48dc22e1c051db54049e005d51a006e69;hp=69eb86efe1a20be590ec2a776715f0347ea7e759;hpb=864eeee51daf303bb48df9fcd64b59ea96b51c0e;p=gnulib.git

diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 69eb86efe..6df517368 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,6 +1,6 @@
-# fflush.m4 serial 11
+# fflush.m4 serial 14
 
-# Copyright (C) 2007-2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2013 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,9 +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
+    REPLACE_FFLUSH=1
   fi
 ])
 
@@ -23,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;
@@ -72,17 +78,5 @@ 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],
-[
-  AC_REQUIRE([AC_C_INLINE])
-  :
-])
+AC_DEFUN([gl_PREREQ_FFLUSH], [:])