40eea690c
Kylie McClain
2016-02-01
Subject
Fix compiling with musl's utmp stubs
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+5 -0
| @@ -20,6 +20,7 @@ | |
| #include <netdb.h> | |
| #include <setjmp.h> | |
| #include <signal.h> | |
| + | #include <paths.h> |
| #if defined __UCLIBC__ /* TODO: and glibc? */ | |
| /* use inlined versions of these: */ | |
| # define sigfillset(s) __sigfillset(s) | |
| @@ -106,7 +107,11 @@ | |
| # define updwtmpx updwtmp | |
| # define _PATH_UTMPX _PATH_UTMP | |
| # else | |
| + | # include <utmp.h> |
| # include <utmpx.h> | |
| + | # if defined _PATH_UTMP && !defined _PATH_UTMPX |
| + | # define _PATH_UTMPX _PATH_UTMP |
| + | # endif |
| # endif | |
| #endif | |
| #if ENABLE_LOCALE_SUPPORT | |
init/init.c+0 -1
| @@ -112,7 +112,6 @@ | |
| #include "libbb.h" | |
| #include <syslog.h> | |
| - | #include <paths.h> |
| #include <sys/resource.h> | |
| #ifdef __linux__ | |
| # include <linux/vt.h> | |
shell/ash.c+0 -1
| @@ -37,7 +37,6 @@ | |
| #define JOBS ENABLE_ASH_JOB_CONTROL | |
| - | #include <paths.h> |
| #include <setjmp.h> | |
| #include <fnmatch.h> | |
| #include <sys/times.h> | |
sysklogd/klogd.c+0 -1
| @@ -98,7 +98,6 @@ static void klogd_close(void) | |
| #else | |
| - | # include <paths.h> |
| # ifndef _PATH_KLOG | |
| # ifdef __GNU__ | |
| # define _PATH_KLOG "/dev/klog" | |