diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:55:47 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:55:47 +0000 |
commit | cd10ccf4d1b4671883a0d45f6769947a6cdb45d0 (patch) | |
tree | b14481899a2c6c4dd53beed82f0f61c6f77254d1 /lib/getcwd.c | |
parent | Adding upstream version 1.21.4. (diff) | |
download | wget-cd10ccf4d1b4671883a0d45f6769947a6cdb45d0.tar.xz wget-cd10ccf4d1b4671883a0d45f6769947a6cdb45d0.zip |
Adding upstream version 1.24.5.upstream/1.24.5upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | lib/getcwd.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/getcwd.c b/lib/getcwd.c index 0530630..214950a 100644 --- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2023 Free Software Foundation, Inc. +/* Copyright (C) 1991-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify @@ -114,13 +114,21 @@ FIXME - if the kernel ever adds support for multi-thread safety for avoiding standard fds, then we should use opendir_safer and openat_safer. */ -#ifdef GNULIB_defined_opendir +#ifdef GNULIB_defined_DIR +# undef DIR # undef opendir -#endif -#ifdef GNULIB_defined_closedir # undef closedir +# undef readdir +# undef rewinddir +#else +# ifdef GNULIB_defined_opendir +# undef opendir +# endif +# ifdef GNULIB_defined_closedir +# undef closedir +# endif #endif - + #if defined _WIN32 && !defined __CYGWIN__ # if HAVE_MSVC_INVALID_PARAMETER_HANDLER static char * |