diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-08 23:15:22 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-08 23:15:22 +0200 |
commit | 853c9cf3718db7c9f6d723e45031016231e1cbd1 (patch) | |
tree | e6a5cafe819de3d14665da32bfd87259b089ec02 /tests/error.c | |
parent | 7b350538dddb27a4513158cb6b6405b85f175ad1 (diff) | |
parent | 10bd216b0099d2ae8cb22c664fb725165096f95c (diff) |
Merge branch 'release/debian/0.9.10-1'debian/0.9.10-1
Diffstat (limited to 'tests/error.c')
-rw-r--r-- | tests/error.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/error.c b/tests/error.c index ce81a1ee..adc87339 100644 --- a/tests/error.c +++ b/tests/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -93,7 +93,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name, # include <fcntl.h> # include <unistd.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> @@ -131,7 +131,7 @@ int strerror_r (int errnum, char *buf, size_t buflen); static int 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. There is no fcntl, and the gnulib replacement fcntl does not support |