From 7d6af77804adc069a83e8566250f868a6cb9786e Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 29 Sep 2015 05:09:46 -0500 Subject: Make defconfig build for nommu. Adds XVFORK() macro, teaches xpopen_both() to call /proc/self/exe with NULL argv (and converts cpio -p to use that), adds TOYBOX_FORK guards to some unconverted commands. --- toys.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'toys.h') diff --git a/toys.h b/toys.h index d8efa667..9c33ff21 100644 --- a/toys.h +++ b/toys.h @@ -67,6 +67,18 @@ #include #include +#include "lib/lib.h" +#include "lib/lsm.h" +#include "toys/e2fs.h" + +// Get list of function prototypes for all enabled command_main() functions. + +#define NEWTOY(name, opts, flags) void name##_main(void); +#define OLDTOY(name, oldname, flags) void oldname##_main(void); +#include "generated/newtoys.h" +#include "generated/flags.h" +#include "generated/globals.h" + // These live in main.c struct toy_list *toy_find(char *name); @@ -132,15 +144,3 @@ extern char **environ; #define GLOBALS(...) #define ARRAY_LEN(array) (sizeof(array)/sizeof(*array)) - -#include "lib/lib.h" -#include "lib/lsm.h" -#include "toys/e2fs.h" - -// Get list of function prototypes for all enabled command_main() functions. - -#define NEWTOY(name, opts, flags) void name##_main(void); -#define OLDTOY(name, oldname, flags) void oldname##_main(void); -#include "generated/newtoys.h" -#include "generated/flags.h" -#include "generated/globals.h" -- cgit v1.2.3