diff options
| author | Mike Gilbert <floppym@gentoo.org> | 2025-10-21 23:59:18 +0900 |
|---|---|---|
| committer | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2025-10-21 23:59:18 +0900 |
| commit | e20df6ee53d7eda6193e67b556f6d34aa208d3dd (patch) | |
| tree | 3ee034fe56415262961eb8c2bc33b4a08014dabb | |
| parent | 53985: update git completion for new options in 2.51 (diff) | |
| download | zsh-e20df6ee53d7eda6193e67b556f6d34aa208d3dd.tar zsh-e20df6ee53d7eda6193e67b556f6d34aa208d3dd.tar.gz zsh-e20df6ee53d7eda6193e67b556f6d34aa208d3dd.tar.bz2 zsh-e20df6ee53d7eda6193e67b556f6d34aa208d3dd.tar.lz zsh-e20df6ee53d7eda6193e67b556f6d34aa208d3dd.tar.xz zsh-e20df6ee53d7eda6193e67b556f6d34aa208d3dd.tar.zst zsh-e20df6ee53d7eda6193e67b556f6d34aa208d3dd.zip | |
53992: check for declaration of fpurge() instead of link-ability
musl-libc has fpurge() but does not declare it in stdio.h. zsh does not
need fpurge() if musl is in use.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/utils.c | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2025-10-21 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + + * Mike Gilbert: 53992: Src/utils.c, configure.ac: check for + declaration of fpurge() instead of its link-ability (as a + workaround of the problem of musl-libc) + 2025-10-02 Oliver Kiddle <opk@zsh.org> * 53985: Completion/Unix/Command/_git: update to 2.51 diff --git a/Src/utils.c b/Src/utils.c index 4ea7b8e93..5e41b712b 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2022,7 +2022,7 @@ redup(int x, int y) { int ret = y; -#ifdef HAVE_FPURGE +#if HAVE_DECL_FPURGE /* Make sure buffers are cleared when changing descriptor for a * FILE object. No fflush() here because the only way anything * can legitimately be left in the buffer is when an error has diff --git a/configure.ac b/configure.ac index 13895bb1d..1f035bc0d 100644 --- a/configure.ac +++ b/configure.ac @@ -1250,7 +1250,7 @@ AC_CHECK_FUNCS(strftime strptime mktime timelocal \ select poll \ readlink faccessx fchdir ftruncate \ fstat lstat lchown fchown fchmod \ - fpurge fseeko ftello \ + fseeko ftello \ mkfifo _mktemp mkstemp \ waitpid wait3 \ sigqueue \ @@ -1292,6 +1292,9 @@ AC_CHECK_FUNCS(strftime strptime mktime timelocal \ setutxent getutxent endutxent getutent) AC_FUNC_STRCOLL +# fpurge exists on musl, but is undeclared in stdio.h and isn't actually required +AC_CHECK_DECLS([fpurge]) + # isinf() and isnan() can exist as either functions or macros. AH_TEMPLATE([HAVE_ISINF], [Define to 1 if you have the `isinf' macro or function.]) |