193c8c738
Rob Landley
2005-07-27
Subject
#ifdef reduction infrastructure, based on an argument between Shaun Jackman, Rob Landley, and others.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Makefile+7 -2
| @@ -122,7 +122,7 @@ $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile | |
| include $(patsubst %,%/Makefile.in, $(SRC_DIRS)) | |
| -include $(top_builddir)/.depend | |
| - | busybox: $(ALL_MAKEFILES) .depend include/config.h $(libraries-y) |
| + | busybox: $(ALL_MAKEFILES) .depend include/bb_config.h $(libraries-y) |
| $(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group | |
| $(STRIPCMD) $@ | |
| @@ -212,6 +212,11 @@ include/config.h: .config | |
| fi; | |
| @$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN) | |
| + | include/bb_config.h: include/config.h |
| + | echo "#ifndef AUTOCONF_INCLUDED" > $@ |
| + | sed -e 's/#undef \(.*\)/static const int \1 = 0;/' < $< >> $@ |
| + | echo "#endif" >> $@ |
| + | |
| finished2: | |
| @echo | |
| @echo Finished installing... | |
| @@ -279,7 +284,7 @@ clean: | |
| distclean: clean | |
| - rm -f scripts/split-include scripts/mkdep | |
| - | - rm -rf include/config include/config.h |
| + | - rm -rf include/config include/config.h include/bb_config.h |
| - find . -name .depend -exec rm -f {} \; | |
| rm -f .config .config.old .config.cmd | |
| - $(MAKE) -C scripts/config clean | |
include/busybox.h+1 -1
| @@ -24,7 +24,7 @@ | |
| #ifndef _BB_INTERNAL_H_ | |
| #define _BB_INTERNAL_H_ 1 | |
| - | #include "config.h" |
| + | #include "bb_config.h" |
| #include <stdio.h> | |
| #include <stdlib.h> | |
include/libbb.h+1 -1
| @@ -41,7 +41,7 @@ | |
| #include <features.h> | |
| - | #include "config.h" |
| + | #include "bb_config.h" |
| #ifdef CONFIG_SELINUX | |
| #include <selinux/selinux.h> | |
| #endif | |
networking/ifconfig.c+2 -0
| @@ -37,6 +37,7 @@ | |
| #include <string.h> /* strcmp and friends */ | |
| #include <ctype.h> /* isdigit and friends */ | |
| #include <stddef.h> /* offsetof */ | |
| + | #include <unistd.h> |
| #include <netdb.h> | |
| #include <sys/ioctl.h> | |
| #include <net/if.h> | |
| @@ -558,6 +559,7 @@ int ifconfig_main(int argc, char **argv) | |
| continue; | |
| } /* end of while-loop */ | |
| + | if (CONFIG_FEATURE_CLEAN_UP) close(sockfd); |
| return goterr; | |
| } | |