blob: ab0c48f763e7da7931de5563d652f17a0d709aee (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From b87113587ed488ee10f621bde099766e13088923 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 25 Jul 2011 09:05:43 +0000
Subject: [PATCH 1/2] libbb.h: do not use homegrown struct sysinfo.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
include/libbb.h | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/include/libbb.h b/include/libbb.h
index 7c1db3f..afe3b61 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -44,6 +44,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>
@@ -100,25 +104,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
--
1.7.5
|
