summaryrefslogtreecommitdiff
path: root/scripts/config/confdata.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2005-09-05 04:13:33 +0000
committerRob Landley <rob@landley.net>2005-09-05 04:13:33 +0000
commit8a7a678b0307f8390986f7020aea96b7927b72f4 (patch)
tree01fe0baffd683abaa750b63ee80ddced47dd608e /scripts/config/confdata.c
parenta1a1a9fa2c9b9e15ad15d3a33cc08d3696d01f3f (diff)
downloadbusybox-w32-8a7a678b0307f8390986f7020aea96b7927b72f4.tar.gz
busybox-w32-8a7a678b0307f8390986f7020aea96b7927b72f4.tar.bz2
busybox-w32-8a7a678b0307f8390986f7020aea96b7927b72f4.zip
Fixes so "make allnoconfig" works again.
The configure system's save function edited out sub-menus that wouldn't be displayed in the current configuration, meaning config.h wouldn't have #udef entries for those symbols, meaning bb_config.h would have the relevant ENABLE_ missing instead of defined to 0. This broke the build. So I fixed it, and then reorganized the applets.c and busybox.c to take away the warnings this revealed (code that would be optimized out was making calls to functions that hadn't been prototyped. So I added an #else case to those #ifdefs to #define the relevant functions to empty macros to placate the warnings. I also reorganized the applets.c code to make adding such an #else case less of a pain (and make the need for prototyping go away by moving the functions up before they were used, and generally wind up with fewer #ifdefs in the code by putting all the logic in one place). This resulted in a huge seeming patch, when most if it just moves code from one place to another without touching it... Upside: make allyesconfig and make allnoconfig should both work now.
Diffstat (limited to 'scripts/config/confdata.c')
-rw-r--r--scripts/config/confdata.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index 0a1f085ae..1d1b61e2b 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -322,8 +322,8 @@ int conf_write(const char *name)
322 while (menu) { 322 while (menu) {
323 sym = menu->sym; 323 sym = menu->sym;
324 if (!sym) { 324 if (!sym) {
325 if (!menu_is_visible(menu)) 325 //if (!menu_is_visible(menu))
326 goto next; 326 // goto next;
327 str = menu_get_prompt(menu); 327 str = menu_get_prompt(menu);
328 fprintf(out, "\n" 328 fprintf(out, "\n"
329 "#\n" 329 "#\n"
@@ -336,8 +336,8 @@ int conf_write(const char *name)
336 " */\n", str); 336 " */\n", str);
337 } else if (!(sym->flags & SYMBOL_CHOICE)) { 337 } else if (!(sym->flags & SYMBOL_CHOICE)) {
338 sym_calc_value(sym); 338 sym_calc_value(sym);
339 if (!(sym->flags & SYMBOL_WRITE)) 339 //if (!(sym->flags & SYMBOL_WRITE))
340 goto next; 340 // goto next;
341 sym->flags &= ~SYMBOL_WRITE; 341 sym->flags &= ~SYMBOL_WRITE;
342 type = sym->type; 342 type = sym->type;
343 if (type == S_TRISTATE) { 343 if (type == S_TRISTATE) {