Imported Upstream version 1.4.19

[platform/upstream/m4.git] / tests / test-dup-safer.c

diff --git a/tests/test-dup-safer.c b/tests/test-dup-safer.c
index fdae635..7ad768f 100644 (file)
--- a/tests/test-dup-safer.c
+++ b/tests/test-dup-safer.c
@@ -1,5 +1,5 @@
 /* Test that dup_safer leaves standard fds alone.
-   Copyright (C) 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2009-2021 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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Eric Blake <ebb9@byu.net>, 2009.  */
 
@@ -29,16 +29,20 @@
 #include "binary-io.h"
 #include "cloexec.h"
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
 /* Get declarations of the native Windows API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 /* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
+# if GNULIB_MSVC_NOTHROW
+#  include "msvc-nothrow.h"
+# else
+#  include <io.h>
+# endif
 #endif
 
 #if !O_BINARY
-# define setmode(f,m) zero ()
+# define set_binary_mode(f,m) zero ()
 static int zero (void) { return 0; }
 #endif
 
@@ -56,7 +60,7 @@ static FILE *myerr;
 static bool
 is_open (int fd)
 {
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
   /* 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.  */
@@ -73,7 +77,7 @@ is_open (int fd)
 static bool
 is_inheritable (int fd)
 {
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
   /* 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.  */
@@ -96,8 +100,8 @@ is_inheritable (int fd)
 static bool
 is_mode (int fd, int mode)
 {
-  int value = setmode (fd, O_BINARY);
-  setmode (fd, value);
+  int value = set_binary_mode (fd, O_BINARY);
+  set_binary_mode (fd, value);
   return mode == value;
 }
 
@@ -139,14 +143,14 @@ main (void)
       ASSERT (errno == EBADF);
 
       /* Preserve text vs. binary.  */
-      setmode (fd, O_BINARY);
+      set_binary_mode (fd, O_BINARY);
       ASSERT (dup (fd) == fd + 1);
       ASSERT (is_open (fd + 1));
       ASSERT (is_inheritable (fd + 1));
       ASSERT (is_mode (fd + 1, O_BINARY));
 
       ASSERT (close (fd + 1) == 0);
-      setmode (fd, O_TEXT);
+      set_binary_mode (fd, O_TEXT);
       ASSERT (dup (fd) == fd + 1);
       ASSERT (is_open (fd + 1));
       ASSERT (is_inheritable (fd + 1));