diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-07-26 13:42:12 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-07-26 13:42:12 +0200 |
| commit | 67905e2d7c6ee273b753af22fb22de0ebec918c1 (patch) | |
| tree | cd61c7674c123307490cf1ff290ecb76a5c2905c /include | |
| parent | 4abcb8b0d1c41544902ccd7927148eea393be37e (diff) | |
| download | busybox-w32-67905e2d7c6ee273b753af22fb22de0ebec918c1.tar.gz busybox-w32-67905e2d7c6ee273b753af22fb22de0ebec918c1.tar.bz2 busybox-w32-67905e2d7c6ee273b753af22fb22de0ebec918c1.zip | |
*: work around sysinfo.h versus linux/*.h problems
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h index 3d31ff225..63d041957 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -52,10 +52,12 @@ | |||
| 52 | #ifdef HAVE_SYS_STATFS_H | 52 | #ifdef HAVE_SYS_STATFS_H |
| 53 | # include <sys/statfs.h> | 53 | # include <sys/statfs.h> |
| 54 | #endif | 54 | #endif |
| 55 | /* struct sysinfo is linux-specific */ | 55 | /* Don't do this here: |
| 56 | #ifdef __linux__ | 56 | * #include <sys/sysinfo.h> |
| 57 | # include <sys/sysinfo.h> | 57 | * Some linux/ includes pull in conflicting definition |
| 58 | #endif | 58 | * of struct sysinfo (only in some toolchanins), which breaks build. |
| 59 | * Include sys/sysinfo.h only in those files which need it. | ||
| 60 | */ | ||
| 59 | #if ENABLE_SELINUX | 61 | #if ENABLE_SELINUX |
| 60 | # include <selinux/selinux.h> | 62 | # include <selinux/selinux.h> |
| 61 | # include <selinux/context.h> | 63 | # include <selinux/context.h> |