d9aabfe57
Sean MacLennan
2018-03-04
Subject
make busybox more portable
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/missing_syscalls.c+2 -3
| @@ -3,14 +3,13 @@ | |
| * | |
| * Licensed under GPLv2, see file LICENSE in this source tree. | |
| */ | |
| - | |
| //kbuild:lib-y += missing_syscalls.o | |
| - | /*#include <linux/timex.h> - for struct timex, but may collide with <time.h> */ |
| - | #include <sys/syscall.h> |
| #include "libbb.h" | |
| #if defined(ANDROID) || defined(__ANDROID__) | |
| + | /*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */ |
| + | # include <sys/syscall.h> |
| pid_t getsid(pid_t pid) | |
| { | |
| return syscall(__NR_getsid, pid); | |
libbb/vfork_daemon_rexec.c+7 -8
| @@ -14,14 +14,6 @@ | |
| * | |
| * Licensed under GPLv2 or later, see file LICENSE in this source tree. | |
| */ | |
| - | #include <sys/prctl.h> |
| - | #ifndef PR_SET_NAME |
| - | #define PR_SET_NAME 15 |
| - | #endif |
| - | #ifndef PR_GET_NAME |
| - | #define PR_GET_NAME 16 |
| - | #endif |
| - | |
| #include "busybox.h" /* uses applet tables */ | |
| #include "NUM_APPLETS.h" | |
| @@ -29,6 +21,13 @@ | |
| #define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)) | |
| #if defined(__linux__) && (NUM_APPLETS > 1) | |
| + | # include <sys/prctl.h> |
| + | # ifndef PR_SET_NAME |
| + | # define PR_SET_NAME 15 |
| + | # endif |
| + | # ifndef PR_GET_NAME |
| + | # define PR_GET_NAME 16 |
| + | # endif |
| void FAST_FUNC set_task_comm(const char *comm) | |
| { | |
| /* okay if too long (truncates) */ | |