diff options
| author | Paul Eggert | 2025-11-04 09:14:54 -0800 |
|---|---|---|
| committer | Paul Eggert | 2025-11-04 13:32:58 -0800 |
| commit | 59fbaca6b9b48c217c60fc5ab21240ba104059e8 (patch) | |
| tree | 32b81d61d969b243df62ab60a3c472a34d200976 /lib/faccessat.c | |
| parent | 327c16ce14897ad4f1e5f9759b9773f97549eae1 (diff) | |
| download | emacs-59fbaca6b9b48c217c60fc5ab21240ba104059e8.tar.gz emacs-59fbaca6b9b48c217c60fc5ab21240ba104059e8.zip | |
Update from Gnulib by running admin/merge-gnulib
* admin/merge-gnulib (GNULIB_MODULES): Add stringeq.
With current Gnulib it is already present as in indirect dependency;
listing it here because Emacs now depends on it directly.
* lib-src/ebrowse.c, lib-src/etags.c:
(streq): Remove, as Gnulib defines this now.
* lib/fseterr.c, lib/fseterr.h, lib/issymlink.c, lib/issymlink.h:
* lib/issymlinkat.c, lib/stdio-consolesafe.c, lib/string.c:
* m4/fseterr.m4, m4/gettext_h.m4, m4/stringeq.m4:
New files from Gnulib.
* src/conf_post.h (tzfree) [__ANDROID_API__ >= 35]: Remove.
Diffstat (limited to 'lib/faccessat.c')
| -rw-r--r-- | lib/faccessat.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/faccessat.c b/lib/faccessat.c index abb912090a9..743f3728871 100644 --- a/lib/faccessat.c +++ b/lib/faccessat.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #define _GL_INCLUDING_UNISTD_H | 22 | #define _GL_INCLUDING_UNISTD_H |
| 23 | #include <config.h> | 23 | #include <config.h> |
| 24 | 24 | ||
| 25 | /* Specification. */ | 25 | /* Get the original definition of faccessat. */ |
| 26 | #include <unistd.h> | 26 | #include <unistd.h> |
| 27 | 27 | ||
| 28 | #include <errno.h> | 28 | #include <errno.h> |
| @@ -40,14 +40,8 @@ orig_faccessat (int fd, char const *name, int mode, int flag) | |||
| 40 | } | 40 | } |
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #ifdef __osf__ | 43 | /* Specification. */ |
| 44 | /* Write "unistd.h" here, not <unistd.h>, otherwise OSF/1 5.1 DTK cc | 44 | #include <unistd.h> |
| 45 | eliminates this include because of the preliminary #include <unistd.h> | ||
| 46 | above. */ | ||
| 47 | # include "unistd.h" | ||
| 48 | #else | ||
| 49 | # include <unistd.h> | ||
| 50 | #endif | ||
| 51 | 45 | ||
| 52 | #ifndef HAVE_ACCESS | 46 | #ifndef HAVE_ACCESS |
| 53 | /* Mingw lacks access, but it also lacks real vs. effective ids, so | 47 | /* Mingw lacks access, but it also lacks real vs. effective ids, so |