diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
| commit | fecf687cc358883de2da21de33346f0df204c80b (patch) | |
| tree | d22c606157926fb659374ae68d55e3a874bacf25 /scripts | |
| parent | b25a7c28a0f684087fa6ccbbc7e265a9cac0f0fa (diff) | |
| parent | 6d463de46b418e6c4c8d1397033608f78b33ab21 (diff) | |
| download | busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.gz busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.bz2 busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.zip | |
Merge branch 'busybox' into merge
Conflicts:
include/libbb.h
shell/ash.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/mconf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index d3f69f8f5..1b0b6ab07 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
| @@ -9,6 +9,8 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #define _XOPEN_SOURCE 700 | 11 | #define _XOPEN_SOURCE 700 |
| 12 | /* On Darwin, this may be needed to get SIGWINCH: */ | ||
| 13 | #define _DARWIN_C_SOURCE 1 | ||
| 12 | 14 | ||
| 13 | #include <sys/ioctl.h> | 15 | #include <sys/ioctl.h> |
| 14 | #include <sys/wait.h> | 16 | #include <sys/wait.h> |