[git commit] make busybox more portable
Denys Vlasenko
vda.linux at googlemail.com
Sun Mar 4 22:15:59 UTC 2018
commit: https://git.busybox.net/busybox/commit/?id=d9aabfe578e58ef8a884c402d6294edc8dfda883
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Move some distro specific include files into the appropriate #ifdef
blocks to make the code more portable.
Signed-off-by: Sean MacLennan <seanm at seanm.ca>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
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 093412811..87cf59b3d 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 <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);
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 6125983ce..c0bea0ed2 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 <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) */
More information about the busybox-cvs
mailing list