diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-07-25 11:05:43 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-07-25 11:05:43 +0200 |
| commit | be391e759675b23ccf6e19cb6ea5b819840f3026 (patch) | |
| tree | fac547956d72c7396e9c86d0d6bd1e2c8355fcea /include | |
| parent | f7f99900fd08153709721814cf5081b2199e3f57 (diff) | |
| download | busybox-be391e759675b23ccf6e19cb6ea5b819840f3026.tar.gz | |
libbb.h: do not use homegrown struct sysinfo.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/include/libbb.h b/include/libbb.h index 1502272f6..3d31ff225 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -52,6 +52,10 @@ #ifdef HAVE_SYS_STATFS_H # include <sys/statfs.h> #endif +/* struct sysinfo is linux-specific */ +#ifdef __linux__ +# include <sys/sysinfo.h> +#endif #if ENABLE_SELINUX # include <selinux/selinux.h> # include <selinux/context.h> @@ -133,25 +137,6 @@ int klogctl(int type, char *b, int len); #if !defined __FreeBSD__ char *dirname(char *path); #endif -/* Include our own copy of struct sysinfo to avoid binary compatibility - * problems with Linux 2.4, which changed things. Grumble, grumble. */ -struct sysinfo { - long uptime; /* Seconds since boot */ - unsigned long loads[3]; /* 1, 5, and 15 minute load averages */ - unsigned long totalram; /* Total usable main memory size */ - unsigned long freeram; /* Available memory size */ - unsigned long sharedram; /* Amount of shared memory */ - unsigned long bufferram; /* Memory used by buffers */ - unsigned long totalswap; /* Total swap space size */ - unsigned long freeswap; /* swap space still available */ - unsigned short procs; /* Number of current processes */ - unsigned short pad; /* Padding needed for m68k */ - unsigned long totalhigh; /* Total high memory size */ - unsigned long freehigh; /* Available high memory size */ - unsigned int mem_unit; /* Memory unit size in bytes */ - char _f[20 - 2 * sizeof(long) - sizeof(int)]; /* Padding: libc5 uses this.. */ -}; -int sysinfo(struct sysinfo* info); #ifndef PATH_MAX # define PATH_MAX 256 #endif |