diff options
| author | Alejandro Colomar <alx.manpages@gmail.com> | 2022-06-18 15:59:12 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx.manpages@gmail.com> | 2022-07-18 19:09:30 +0200 |
| commit | 5015b05fc495bf3e87f8decfd1617a4a399939d4 (patch) | |
| tree | c55a67d647c323f718f3ebcf4673bb49d9515567 | |
| parent | 0d15cbd5b6136d8a92a23895bd83eb322aa633ea (diff) | |
| download | unit-5015b05fc495bf3e87f8decfd1617a4a399939d4.tar.gz unit-5015b05fc495bf3e87f8decfd1617a4a399939d4.tar.bz2 | |
Replaced Linux syscall macros by libc macros.
User-space programs should use the SYS_*form, as documented in
syscall(2). That also adds compatibility to non-Linux systems.
| -rw-r--r-- | auto/isolation | 4 | ||||
| -rw-r--r-- | src/nxt_clone.c | 4 | ||||
| -rw-r--r-- | src/nxt_isolation.c | 2 | ||||
| -rw-r--r-- | src/nxt_process.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/auto/isolation b/auto/isolation index fd35f8ed..4ade6a38 100644 --- a/auto/isolation +++ b/auto/isolation @@ -21,7 +21,7 @@ nxt_feature_test="#include <sys/wait.h> #include <sys/syscall.h> int main() { - return __NR_clone | SIGCHLD; + return SYS_clone | SIGCHLD; }" . auto/feature @@ -68,7 +68,7 @@ nxt_feature_libs= nxt_feature_test="#include <sys/syscall.h> int main() { - return __NR_pivot_root; + return SYS_pivot_root; }" . auto/feature diff --git a/src/nxt_clone.c b/src/nxt_clone.c index aa952a54..a9b39ac1 100644 --- a/src/nxt_clone.c +++ b/src/nxt_clone.c @@ -14,9 +14,9 @@ pid_t nxt_clone(nxt_int_t flags) { #if defined(__s390x__) || defined(__s390__) || defined(__CRIS__) - return syscall(__NR_clone, NULL, flags); + return syscall(SYS_clone, NULL, flags); #else - return syscall(__NR_clone, flags, NULL); + return syscall(SYS_clone, flags, NULL); #endif } diff --git a/src/nxt_isolation.c b/src/nxt_isolation.c index e3cb1f22..7bb8dbfd 100644 --- a/src/nxt_isolation.c +++ b/src/nxt_isolation.c @@ -1003,7 +1003,7 @@ fail: nxt_inline int nxt_pivot_root(const char *new_root, const char *old_root) { - return syscall(__NR_pivot_root, new_root, old_root); + return syscall(SYS_pivot_root, new_root, old_root); } diff --git a/src/nxt_process.h b/src/nxt_process.h index 694f457e..642c3419 100644 --- a/src/nxt_process.h +++ b/src/nxt_process.h @@ -19,7 +19,7 @@ * fork(2) calls. As we use clone(2) for container, it returns the wrong pid. */ #define nxt_getpid() \ - syscall(__NR_getpid) + syscall(SYS_getpid) #else #define nxt_getpid() \ getpid() |