emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make busybox more portable

Browse Source 
Move some distro specific include files into the appropriate #ifdef
blocks to make the code more portable.

Signed-off-by: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Sean MacLennan 2018-03-04 23:15:59 +01:00 committed by Denys Vlasenko
parent d4802c6243
commit d9aabfe578
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libbb/missing_syscalls.c
View File

@ -3,14 +3,13 @@
* *
* Licensed under GPLv2, see file LICENSE in this source tree. * Licensed under GPLv2, see file LICENSE in this source tree.
*/ */
//kbuild:lib-y += missing_syscalls.o //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" #include "libbb.h"
#if defined(ANDROID) || defined(__ANDROID__) #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) pid_t getsid(pid_t pid)
{ {
return syscall(__NR_getsid, pid); return syscall(__NR_getsid, pid);

15
libbb/vfork_daemon_rexec.c
View File

@ -14,14 +14,6 @@
* *
* Licensed under GPLv2 or later, see file LICENSE in this source tree. * 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 "busybox.h" /* uses applet tables */
#include "NUM_APPLETS.h" #include "NUM_APPLETS.h"
@ -29,6 +21,13 @@
#define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)) #define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE))
#if defined(__linux__) && (NUM_APPLETS > 1) #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) void FAST_FUNC set_task_comm(const char *comm)
{ {
/* okay if too long (truncates) */ /* okay if too long (truncates) */