From d9aabfe578e58ef8a884c402d6294edc8dfda883 Mon Sep 17 00:00:00 2001 From: Sean MacLennan Date: Sun, 4 Mar 2018 23:15:59 +0100 Subject: make busybox more portable Move some distro specific include files into the appropriate #ifdef blocks to make the code more portable. Signed-off-by: Sean MacLennan Signed-off-by: Denys Vlasenko --- libbb/missing_syscalls.c | 5 ++--- libbb/vfork_daemon_rexec.c | 15 +++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c index 0934128..87cf59b 100644 --- a/libbb/missing_syscalls.c +++ b/libbb/missing_syscalls.c @@ -3,14 +3,13 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - //kbuild:lib-y += missing_syscalls.o -/*#include - for struct timex, but may collide with */ -#include #include "libbb.h" #if defined(ANDROID) || defined(__ANDROID__) +/*# include - for struct timex, but may collide with */ +# include pid_t getsid(pid_t pid) { return syscall(__NR_getsid, pid); diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c index 6125983..c0bea0e 100644 --- a/libbb/vfork_daemon_rexec.c +++ b/libbb/vfork_daemon_rexec.c @@ -14,14 +14,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -#include -#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 +# 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) */ -- cgit v1.1