diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-01-13 09:11:24 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-01-13 09:11:24 +0000 |
| commit | e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c (patch) | |
| tree | af786c447cae6ca59e195b31fbae442c0b42d198 /scripts/basic/fixdep.c | |
| parent | 215f730e98215bff8dfacafdaa70e4a11395ad53 (diff) | |
| parent | 0f592d7fb94c5887528d0ee24020c2225ab71c28 (diff) | |
| download | busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.tar.gz busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.tar.bz2 busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.zip | |
Merge branch 'busybox' into merge
Conflicts:
include/platform.h
scripts/basic/fixdep.c
Diffstat (limited to 'scripts/basic/fixdep.c')
| -rw-r--r-- | scripts/basic/fixdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index b7f9e0c2f..f012551af 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
| @@ -117,7 +117,7 @@ | |||
| 117 | #ifndef __MINGW32__ | 117 | #ifndef __MINGW32__ |
| 118 | #include <arpa/inet.h> | 118 | #include <arpa/inet.h> |
| 119 | #endif | 119 | #endif |
| 120 | #include <alloca.h> | 120 | //bbox disabled: #include <alloca.h> |
| 121 | 121 | ||
| 122 | /* bbox: not needed | 122 | /* bbox: not needed |
| 123 | #define INT_CONF ntohl(0x434f4e46) | 123 | #define INT_CONF ntohl(0x434f4e46) |