diff options
| author | Ulf Hermann <[email protected]> | 2018-07-17 09:14:31 +0200 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2018-07-20 14:45:07 +0000 |
| commit | 6166020e5f1acc87c3f00f0d2f15f073971be545 (patch) | |
| tree | 14720ecb9d6e28847c78fa77a931a5328e8afe31 /libgnu/write.c | |
| parent | 191f0057b0b978a0e5bf9168acdcc381b4196494 (diff) | |
Update gnulib modules, replacing canonicalize with canonicalize-lgpl
We need realpath() now, as upstream has changed to use that. Updating
single gnulib modules is not really possible, so we update everything.
Change-Id: I32943a1c8af7c1ecce625dca173a942cc58d9c38
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'libgnu/write.c')
| -rw-r--r-- | libgnu/write.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libgnu/write.c b/libgnu/write.c index 6a3b623e..06166241 100644 --- a/libgnu/write.c +++ b/libgnu/write.c @@ -1,5 +1,5 @@ /* POSIX compatible write() function. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible <[email protected]>, 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,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/>. */ #include <config.h> @@ -25,7 +25,7 @@ GetLastError() = ERROR_NO_DATA, and write() in consequence fails with error EINVAL. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ # include <errno.h> # include <signal.h> @@ -34,8 +34,14 @@ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include <windows.h> -# include "msvc-inval.h" -# include "msvc-nothrow.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif # undef write |