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-67905e2d7c6ee273b753af22fb22de0ebec918c1.tar.gz | |
*: 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 @@ #ifdef HAVE_SYS_STATFS_H # include <sys/statfs.h> #endif -/* struct sysinfo is linux-specific */ -#ifdef __linux__ -# include <sys/sysinfo.h> -#endif +/* Don't do this here: + * #include <sys/sysinfo.h> + * Some linux/ includes pull in conflicting definition + * of struct sysinfo (only in some toolchanins), which breaks build. + * Include sys/sysinfo.h only in those files which need it. + */ #if ENABLE_SELINUX # include <selinux/selinux.h> # include <selinux/context.h> |