[git commit master] libbb: locate PAGE_SIZE on Hurd

Denys Vlasenko vda.linux at googlemail.com
Mon Mar 29 09:02:00 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=3d0e7794ebf73c0dd1485c0df406084c46c3da1f
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/appletlib.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index b31532a..2d52c3d 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -26,11 +26,16 @@
  *
  * FEATURE_INSTALLER or FEATURE_SUID will still link printf routines in. :(
  */
-
 #include "busybox.h"
 #include <assert.h>
 #include <malloc.h>
-#include <sys/user.h> /* PAGE_SIZE */
+/* Try to pull in PAGE_SIZE */
+#ifdef __linux__
+# include <sys/user.h>
+#endif
+#ifdef __GNU__ /* Hurd */
+# include <mach/vm_param.h>
+#endif
 
 
 /* Declare <applet>_main() */
@@ -41,13 +46,13 @@
 #if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
 /* Define usage_messages[] */
 static const char usage_messages[] ALIGN1 = ""
-#define MAKE_USAGE
-#include "usage.h"
-#include "applets.h"
+# define MAKE_USAGE
+# include "usage.h"
+# include "applets.h"
 ;
-#undef MAKE_USAGE
+# undef MAKE_USAGE
 #else
-#define usage_messages 0
+# define usage_messages 0
 #endif /* SHOW_USAGE */
 
 
-- 
1.6.3.3



More information about the busybox-cvs mailing list