From 7bfa88f315d71c7f7a1b76fcec3886c7506aca24 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 13 Feb 2006 19:16:41 +0000 Subject: New USE() macros For each CONFIG_SYMBOL, include/bb_config.h now has both ENABLE_SYMBOL and USE_SYMBOL(x). ENABLE_SYMBOL is still always defined (1 or 0) so that if(ENABLE) should optimize out when it's zero. The USE_SYMBOL(X) will only splice in X if the symbol is defined, otherwise it'll be empty. Thus we can convert this: #ifdef CONFIG_ARGS opt = bb_getopt_ulflags(argc, argv, "ab:c" #ifdef CONFIG_THINGY "d:" #endif , &bvalue #ifdef CONFIG_THINGY , &thingy #endif ); #endif into this: if (ENABLE_ARGS) { opt = bb_getopt_ulflags(argc, argv, "ab:c" USE_THINGY("d:"), &bvalue USE_THINGY(, &thingy)); } And it should produce the same code. Unlike the old versions in include/_usage.h, the new USE_SYMBOL(x) can handle commas in its arguments (as shown above). (The _usage.h file is obsolete and no longer generated.) Nobody should need to include config.h directly anymore, bb_config.h should define all the configuration stuff we need. Someday, the CONFIG_SYMBOL versions should go away in favor of ENABLE_SYMBOL and USE_SYMBOL(). Thanks to vodz for the new version of bb_mkdep.c that works with function macros. --- include/platform.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/platform.h b/include/platform.h index 773d6b8..68c7abb 100644 --- a/include/platform.h +++ b/include/platform.h @@ -78,9 +78,4 @@ # endif #endif - -/* include USAGE_APPLET_x helper macros for usage.h. */ -/* -#include "_usage.h" -*/ #endif /* platform.h */ -- cgit v1.1