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/lseek.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/lseek.c')
| -rw-r--r-- | libgnu/lseek.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libgnu/lseek.c b/libgnu/lseek.c index 3b2fdf2e..9125b980 100644 --- a/libgnu/lseek.c +++ b/libgnu/lseek.c @@ -1,5 +1,5 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2018 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,19 +12,23 @@ 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/>. */ + with this program; if not, see <https://www.gnu.org/licenses/>. */ #include <config.h> /* Specification. */ #include <unistd.h> -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* Windows platforms. */ /* Get GetFileType. */ # include <windows.h> /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif #else # include <sys/stat.h> #endif @@ -35,7 +39,7 @@ off_t rpl_lseek (int fd, off_t offset, int whence) { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +#if defined _WIN32 && ! defined __CYGWIN__ /* mingw lseek mistakenly succeeds on pipes, sockets, and terminals. */ HANDLE h = (HANDLE) _get_osfhandle (fd); if (h == INVALID_HANDLE_VALUE) |