diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
| commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
| tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /scripts/basic/fixdep.c | |
| parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
| parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
| download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip | |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'scripts/basic/fixdep.c')
| -rw-r--r-- | scripts/basic/fixdep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index fd2e2375f..b7f9e0c2f 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
| @@ -117,6 +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 | 121 | ||
| 121 | /* bbox: not needed | 122 | /* bbox: not needed |
| 122 | #define INT_CONF ntohl(0x434f4e46) | 123 | #define INT_CONF ntohl(0x434f4e46) |