X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdup2.c;h=790c98a2e846c7ccd823b98c5ed2e816a3a5705c;hb=e6ac916bda3887c54cc8668be7a0936b034a28c3;hp=278261fcd2ca18b0fd1ef97d2e661c0c4a3aa38d;hpb=968e8d50f9662a5622e839e3e37487e304c7f962;p=gnulib.git

diff --git a/lib/dup2.c b/lib/dup2.c
index 278261fcd..790c98a2e 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -40,7 +40,7 @@
 /* Get _get_osfhandle.  */
 #  include "msvc-nothrow.h"
 
-static inline int
+static int
 ms_windows_dup2 (int fd, int desired_fd)
 {
   int result;
@@ -92,7 +92,7 @@ rpl_dup2 (int fd, int desired_fd)
 {
   int result;
 
-# if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+# ifdef F_GETFL
   /* On Linux kernels 2.6.26-2.6.29, dup2 (fd, fd) returns -EBADF.
      On Cygwin 1.5.x, dup2 (1, 1) returns 0.
      On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC.  */