summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-05-14 14:39:35 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-05-14 14:39:35 +0000
commit17081323f1560596df0f8adc78fd30939e14fad2 (patch)
tree06bb7c818e2feaf285ce61ca88a58bc1957050b5
parent278ed5e9c6d9b35a7854b31870dbe114d1cba8b2 (diff)
downloaddrakx-17081323f1560596df0f8adc78fd30939e14fad2.tar
drakx-17081323f1560596df0f8adc78fd30939e14fad2.tar.gz
drakx-17081323f1560596df0f8adc78fd30939e14fad2.tar.bz2
drakx-17081323f1560596df0f8adc78fd30939e14fad2.tar.xz
drakx-17081323f1560596df0f8adc78fd30939e14fad2.zip
fix conflicts with dietlibc headers
-rw-r--r--mdk-stage1/insmod-busybox/busybox.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/mdk-stage1/insmod-busybox/busybox.h b/mdk-stage1/insmod-busybox/busybox.h
index 6e7bae39b..a2d620c8b 100644
--- a/mdk-stage1/insmod-busybox/busybox.h
+++ b/mdk-stage1/insmod-busybox/busybox.h
@@ -40,7 +40,7 @@
/* for the _syscall() macros */
#include <sys/syscall.h>
#include <linux/unistd.h>
-
+#include <linux/kernel.h>
/* Some useful definitions */
#define FALSE ((int) 1)
@@ -438,21 +438,21 @@ int nfsmount(const char *spec, const char *node, int *flags,
/* Include our own copy of struct sysinfo to avoid binary compatability
* 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 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.. */
-};
+//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 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.. */
+//};
extern int sysinfo (struct sysinfo* info);
/* Bit map related macros -- libc5 doens't provide these... sigh. */