diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2023-02-28 10:30:50 -0800 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2023-02-28 10:30:50 -0800 |
| commit | 2cc95374dee1fba712a8520c03b72a763ea0b40b (patch) | |
| tree | 9cf241d0cd7e191466e91156c99429f9491c76ac /src/nxt_process.h | |
| parent | cae4a4e4185503725d412d52d880189f46b76ef5 (diff) | |
| parent | 0af1253c17161b19a5c61a0bbb262f6cd2e515ed (diff) | |
| download | unit-2cc95374dee1fba712a8520c03b72a763ea0b40b.tar.gz unit-2cc95374dee1fba712a8520c03b72a763ea0b40b.tar.bz2 | |
Merged with the 1.29 branch.
Diffstat (limited to '')
| -rw-r--r-- | src/nxt_process.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/nxt_process.h b/src/nxt_process.h index 0db68d45..16d6110c 100644 --- a/src/nxt_process.h +++ b/src/nxt_process.h @@ -7,24 +7,12 @@ #ifndef _NXT_PROCESS_H_INCLUDED_ #define _NXT_PROCESS_H_INCLUDED_ -#if (NXT_HAVE_CLONE) +#if (NXT_HAVE_LINUX_NS) #include <unistd.h> #include <nxt_clone.h> #endif -#if (NXT_HAVE_CLONE) -/* - * Old glibc wrapper for getpid(2) returns a cached pid invalidated only by - * fork(2) calls. As we use clone(2) for container, it returns the wrong pid. - */ -#define nxt_getpid() \ - syscall(SYS_getpid) -#else -#define nxt_getpid() \ - getpid() -#endif - typedef pid_t nxt_pid_t; @@ -100,7 +88,7 @@ typedef struct { nxt_cgroup_t cgroup; #endif -#if (NXT_HAVE_CLONE) +#if (NXT_HAVE_LINUX_NS) nxt_clone_t clone; #endif |