diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | Src/Builtins/rlimits.c | 6 | ||||
| -rw-r--r-- | Src/Modules/curses.mdd | 4 | ||||
| -rw-r--r-- | Src/params.c | 4 | ||||
| -rwxr-xr-x | Test/ztst.zsh | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
7 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2025-11-03 Oliver Kiddle <opk@zsh.org> + + * 54019: configure.ac, Makefile.in, Src/params.c, Test/ztst.zsh, + Src/Builtins/rlimits.c, Src/Modules/curses.mdd: AIX support fixes + 2025-10-31 Bart Schaefer <schaefer@zsh.org> * Jim Murphy: 53783: Functions/Prompts/prompt_adam2_setup, diff --git a/Makefile.in b/Makefile.in index d8568294b..67a62ede4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,8 +36,6 @@ sdir = @srcdir@ sdir_top = @top_srcdir@ INSTALL = @INSTALL@ -@DEFS_MK@ - # ========== DEPENDENCIES FOR BUILDING ========== # default target @@ -46,6 +44,8 @@ all: config.h config.modules (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \ done +@DEFS_MK@ + # prepare module configuration prep: @cd Src && $(MAKE) $(MAKEDEFS) $@ diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index 65226dc9a..e76c2118d 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -158,8 +158,12 @@ static const resinfo_T known_resources[] = { {RLIMIT_NTHR, "maxpthreads", ZLIMTYPE_NUMBER, 1, 'r', "threads"}, # endif +# if defined(HAVE_RLIMIT_THREADS) && !defined(HAVE_RLIMIT_RTPRIO) && !defined(HAVE_RLIMIT_NTHR) /* AIX */ + {RLIMIT_THREADS, "threads", ZLIMTYPE_NUMBER, 1, + 'r', "threads (per process)"}, +# endif /* others */ -# if defined(HAVE_RLIMIT_PTHREAD) && !defined(HAVE_RLIMIT_NTHR) /* IRIX ? */ +# if defined(HAVE_RLIMIT_PTHREAD) && !defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_THREADS) /* IRIX ? */ {RLIMIT_PTHREAD, "maxpthreads", ZLIMTYPE_NUMBER, 1, 'T', "threads per process"}, # endif diff --git a/Src/Modules/curses.mdd b/Src/Modules/curses.mdd index 80c8f867b..75da29a6d 100644 --- a/Src/Modules/curses.mdd +++ b/Src/Modules/curses.mdd @@ -11,4 +11,8 @@ curses.o curses..o: curses_keys.h curses_keys.h: curses_keys.awk @CURSES_KEYS_H@ $(AWK) -f $(sdir)/curses_keys.awk @CURSES_KEYS_H@ /dev/null >curses_keys.h + +clean-here: clean.curses +clean.curses: + rm -f curses_keys.h Make diff --git a/Src/params.c b/Src/params.c index 654c30794..5a0434e40 100644 --- a/Src/params.c +++ b/Src/params.c @@ -4005,7 +4005,7 @@ strsetfn(Param pm, char *x) static char *nullarray = NULL; /**/ -char ** +mod_export char ** arrgetfn(Param pm) { return pm->u.arr ? pm->u.arr : &nullarray; @@ -6455,7 +6455,7 @@ upscope(Param pm, int reflevel) } /**/ -mod_export Param +static Param upscope_upper(Param pm, int reflevel) { while (pm && pm->level > reflevel) diff --git a/Test/ztst.zsh b/Test/ztst.zsh index 1d05baddf..aeb02cd54 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -343,7 +343,7 @@ ZTST_diff() { ;; esac shift - [[ $OSTYPE != solaris* ]] && diff_arg=( -a ) + [[ $OSTYPE != (aix|solaris)* ]] && diff_arg=( -a ) if (( diff_pat )); then local -a diff_lines1 diff_lines2 diff --git a/configure.ac b/configure.ac index 1f035bc0d..3913ce9fc 100644 --- a/configure.ac +++ b/configure.ac @@ -1863,6 +1863,7 @@ zsh_LIMIT_PRESENT(RLIMIT_NPROC) zsh_LIMIT_PRESENT(RLIMIT_NTHR) zsh_LIMIT_PRESENT(RLIMIT_NOFILE) zsh_LIMIT_PRESENT(RLIMIT_PTHREAD) +zsh_LIMIT_PRESENT(RLIMIT_THREADS) zsh_LIMIT_PRESENT(RLIMIT_RSS) zsh_LIMIT_PRESENT(RLIMIT_SBSIZE) zsh_LIMIT_PRESENT(RLIMIT_TCACHE) |