aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-08-24 13:47:41 +0100
committerRon Yorston <rmy@pobox.com>2017-08-30 16:05:34 +0100
commit002f3c9ea19a1cd68294d905f566be5b615a9bef (patch)
tree407c376bdf1bbf9a7e1363caa268e6b36469ae4f /libbb
parent7a4491e1f8c77a9825bb70fa4367549746eb90c0 (diff)
downloadbusybox-w32-002f3c9ea19a1cd68294d905f566be5b615a9bef.tar.gz
busybox-w32-002f3c9ea19a1cd68294d905f566be5b615a9bef.tar.bz2
busybox-w32-002f3c9ea19a1cd68294d905f566be5b615a9bef.zip
libbb: exclude more Linux-specific functions from being compiled
In 7a4491e1f (libbb: don't compile various Linux-specific functions, 2017-08-24), we started excluding a number of Linux-specific functions that handle things like SELinux, ioctls, devices and forking. But we forgot a couple functions that depend on the ones we now excluded. This leads to compile failures with -Werror unless cross-compiling on Linux, due to undefined symbols. To fix this, exclude those functions which depend on the ones that were excluded (they do not have any callers on Windows anyway, so all is good). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Ron Yorston <rmy@pobox.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/vfork_daemon_rexec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index eca2fabf5..1c24f0d10 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -232,6 +232,7 @@ int FAST_FUNC spawn_and_wait(char **argv)
232 return wait4pid(rc); 232 return wait4pid(rc);
233} 233}
234 234
235#if !ENABLE_PLATFORM_MINGW32
235#if !BB_MMU 236#if !BB_MMU
236void FAST_FUNC re_exec(char **argv) 237void FAST_FUNC re_exec(char **argv)
237{ 238{
@@ -318,3 +319,4 @@ void FAST_FUNC bb_sanitize_stdio(void)
318{ 319{
319 bb_daemonize_or_rexec(DAEMON_ONLY_SANITIZE, NULL); 320 bb_daemonize_or_rexec(DAEMON_ONLY_SANITIZE, NULL);
320} 321}
322#endif /* !MINGW32 */