diff options
Diffstat (limited to 'recipes-append/busybox/busybox-1.18.5/0001-libbb.h-do-not-use-homegrown-struct-sysinfo.patch')
-rw-r--r-- | recipes-append/busybox/busybox-1.18.5/0001-libbb.h-do-not-use-homegrown-struct-sysinfo.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/recipes-append/busybox/busybox-1.18.5/0001-libbb.h-do-not-use-homegrown-struct-sysinfo.patch b/recipes-append/busybox/busybox-1.18.5/0001-libbb.h-do-not-use-homegrown-struct-sysinfo.patch deleted file mode 100644 index ab0c48f..0000000 --- a/recipes-append/busybox/busybox-1.18.5/0001-libbb.h-do-not-use-homegrown-struct-sysinfo.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From b87113587ed488ee10f621bde099766e13088923 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Vlasenko <vda.linux@googlemail.com> | ||
3 | Date: Mon, 25 Jul 2011 09:05:43 +0000 | ||
4 | Subject: [PATCH 1/2] libbb.h: do not use homegrown struct sysinfo. | ||
5 | |||
6 | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | ||
7 | --- | ||
8 | include/libbb.h | 23 ++++------------------- | ||
9 | 1 files changed, 4 insertions(+), 19 deletions(-) | ||
10 | |||
11 | diff --git a/include/libbb.h b/include/libbb.h | ||
12 | index 7c1db3f..afe3b61 100644 | ||
13 | --- a/include/libbb.h | ||
14 | +++ b/include/libbb.h | ||
15 | @@ -44,6 +44,10 @@ | ||
16 | #ifdef HAVE_SYS_STATFS_H | ||
17 | # include <sys/statfs.h> | ||
18 | #endif | ||
19 | +/* struct sysinfo is linux-specific */ | ||
20 | +#ifdef __linux__ | ||
21 | +# include <sys/sysinfo.h> | ||
22 | +#endif | ||
23 | #if ENABLE_SELINUX | ||
24 | # include <selinux/selinux.h> | ||
25 | # include <selinux/context.h> | ||
26 | @@ -100,25 +104,6 @@ int klogctl(int type, char *b, int len); | ||
27 | #if !defined __FreeBSD__ | ||
28 | char *dirname(char *path); | ||
29 | #endif | ||
30 | -/* Include our own copy of struct sysinfo to avoid binary compatibility | ||
31 | - * problems with Linux 2.4, which changed things. Grumble, grumble. */ | ||
32 | -struct sysinfo { | ||
33 | - long uptime; /* Seconds since boot */ | ||
34 | - unsigned long loads[3]; /* 1, 5, and 15 minute load averages */ | ||
35 | - unsigned long totalram; /* Total usable main memory size */ | ||
36 | - unsigned long freeram; /* Available memory size */ | ||
37 | - unsigned long sharedram; /* Amount of shared memory */ | ||
38 | - unsigned long bufferram; /* Memory used by buffers */ | ||
39 | - unsigned long totalswap; /* Total swap space size */ | ||
40 | - unsigned long freeswap; /* swap space still available */ | ||
41 | - unsigned short procs; /* Number of current processes */ | ||
42 | - unsigned short pad; /* Padding needed for m68k */ | ||
43 | - unsigned long totalhigh; /* Total high memory size */ | ||
44 | - unsigned long freehigh; /* Available high memory size */ | ||
45 | - unsigned int mem_unit; /* Memory unit size in bytes */ | ||
46 | - char _f[20 - 2 * sizeof(long) - sizeof(int)]; /* Padding: libc5 uses this.. */ | ||
47 | -}; | ||
48 | -int sysinfo(struct sysinfo* info); | ||
49 | #ifndef PATH_MAX | ||
50 | # define PATH_MAX 256 | ||
51 | #endif | ||
52 | -- | ||
53 | 1.7.5 | ||
54 | |||