mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-12-05 01:10:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

54019: AIX support fixes

Browse Source
This commit is contained in:
Oliver Kiddle
2025-11-03 20:17:00 +01:00
parent 15f4567148
commit 8e27709d2a
7 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -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> 2025-10-31 Bart Schaefer <schaefer@zsh.org>
* Jim Murphy: 53783: Functions/Prompts/prompt_adam2_setup, * Jim Murphy: 53783: Functions/Prompts/prompt_adam2_setup,

4
Makefile.in
View File

@@ -36,8 +36,6 @@ sdir = @srcdir@
sdir_top = @top_srcdir@ sdir_top = @top_srcdir@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
@DEFS_MK@
# ========== DEPENDENCIES FOR BUILDING ========== # ========== DEPENDENCIES FOR BUILDING ==========
# default target # default target
@@ -46,6 +44,8 @@ all: config.h config.modules
(cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \ (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
done done
@DEFS_MK@
# prepare module configuration # prepare module configuration
prep: prep:
@cd Src && $(MAKE) $(MAKEDEFS) $@ @cd Src && $(MAKE) $(MAKEDEFS) $@

6
Src/Builtins/rlimits.c
View File

@@ -157,9 +157,13 @@ static const resinfo_T known_resources[] = {
# if defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_RTPRIO) /* Net/OpenBSD */ # if defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_RTPRIO) /* Net/OpenBSD */
{RLIMIT_NTHR, "maxpthreads", ZLIMTYPE_NUMBER, 1, {RLIMIT_NTHR, "maxpthreads", ZLIMTYPE_NUMBER, 1,
'r', "threads"}, '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 # endif
/* others */ /* 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, {RLIMIT_PTHREAD, "maxpthreads", ZLIMTYPE_NUMBER, 1,
'T', "threads per process"}, 'T', "threads per process"},
# endif # endif

4
Src/Modules/curses.mdd
View File

@@ -11,4 +11,8 @@ curses.o curses..o: curses_keys.h
curses_keys.h: curses_keys.awk @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 $(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 Make

4
Src/params.c
View File

@@ -4005,7 +4005,7 @@ strsetfn(Param pm, char *x)
static char *nullarray = NULL; static char *nullarray = NULL;
/**/ /**/
char ** mod_export char **
arrgetfn(Param pm) arrgetfn(Param pm)
{ {
return pm->u.arr ? pm->u.arr : &nullarray; 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) upscope_upper(Param pm, int reflevel)
{ {
while (pm && pm->level > reflevel) while (pm && pm->level > reflevel)

2
Test/ztst.zsh
View File

@@ -343,7 +343,7 @@ ZTST_diff() {
;; ;;
esac esac
shift shift
[[ $OSTYPE != solaris* ]] && diff_arg=( -a ) [[ $OSTYPE != (aix|solaris)* ]] && diff_arg=( -a )
if (( diff_pat )); then if (( diff_pat )); then
local -a diff_lines1 diff_lines2 local -a diff_lines1 diff_lines2

1
configure.ac
View File

@@ -1863,6 +1863,7 @@ zsh_LIMIT_PRESENT(RLIMIT_NPROC)
zsh_LIMIT_PRESENT(RLIMIT_NTHR) zsh_LIMIT_PRESENT(RLIMIT_NTHR)
zsh_LIMIT_PRESENT(RLIMIT_NOFILE) zsh_LIMIT_PRESENT(RLIMIT_NOFILE)
zsh_LIMIT_PRESENT(RLIMIT_PTHREAD) zsh_LIMIT_PRESENT(RLIMIT_PTHREAD)
zsh_LIMIT_PRESENT(RLIMIT_THREADS)
zsh_LIMIT_PRESENT(RLIMIT_RSS) zsh_LIMIT_PRESENT(RLIMIT_RSS)
zsh_LIMIT_PRESENT(RLIMIT_SBSIZE) zsh_LIMIT_PRESENT(RLIMIT_SBSIZE)
zsh_LIMIT_PRESENT(RLIMIT_TCACHE) zsh_LIMIT_PRESENT(RLIMIT_TCACHE)