In some places the define __uClinux__ is still used to determine a non-MMU
system.
The attached patch replaces these occurrences with the BB_MMU define.
Thomas
--- busybox-1.16.0/procps/free.c 2010-01-25 01:59:38.000000000 +0100
+++ busybox.new2/procps/free.c 2010-02-19 15:49:33.509517617 +0100
@@ -27,7 +27,7 @@
/* TODO: Make all this stuff not overflow when mem >= 4 Gib */
info.totalram/=info.mem_unit;
info.freeram/=info.mem_unit;
-#ifndef __uClinux__
+#if BB_MMU
info.totalswap/=info.mem_unit;
info.freeswap/=info.mem_unit;
#endif
@@ -38,7 +38,7 @@
/* TODO: Make all this stuff not overflow when mem >= 4 Gib */
info.totalram*=info.mem_unit;
info.freeram*=info.mem_unit;
-#ifndef __uClinux__
+#if BB_MMU
info.totalswap*=info.mem_unit;
info.freeswap*=info.mem_unit;
#endif
@@ -56,7 +56,7 @@
info.totalram-info.freeram, info.freeram,
info.sharedram, info.bufferram);
-#ifndef __uClinux__
+#if BB_MMU
printf("%6s%13ld%13ld%13ld\n", "Swap:", info.totalswap,
info.totalswap-info.freeswap, info.freeswap);
--- busybox-1.16.0/shell/ash.c 2010-01-25 01:59:38.000000000 +0100
+++ busybox.new2/shell/ash.c 2010-02-19 15:52:57.560601769 +0100
@@ -73,7 +73,7 @@
# define PIPE_BUF 4096 /* amount of buffering in a pipe */
#endif
-#if defined(__uClinux__)
+#if !BB_MMU
# error "Do not even bother, ash will not run on NOMMU machine"
#endif
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox
