diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Builtins/rlimits.c | 6 | ||||
| -rw-r--r-- | Src/Modules/curses.mdd | 4 | ||||
| -rw-r--r-- | Src/params.c | 4 |
3 files changed, 11 insertions, 3 deletions
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) |