diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
| commit | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (patch) | |
| tree | 6709ddd6071a9c238ba69233540bbcfe560c6a44 /libbb/getopt32.c | |
| parent | 67758035a4fe040c6ac69b39d61bcd6bddd7b827 (diff) | |
| parent | 56a3b82e9692a25ef9c9269e88feac0d579ce8e8 (diff) | |
| download | busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.gz busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.bz2 busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.zip | |
Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge
Conflicts:
coreutils/ls.c
include/platform.h
libbb/bb_basename.c
Diffstat (limited to 'libbb/getopt32.c')
| -rw-r--r-- | libbb/getopt32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libbb/getopt32.c b/libbb/getopt32.c index 8087b3ba6..02cbefec9 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c | |||
| @@ -7,7 +7,9 @@ | |||
| 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <getopt.h> | 10 | #if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG |
| 11 | # include <getopt.h> | ||
| 12 | #endif | ||
| 11 | #include "libbb.h" | 13 | #include "libbb.h" |
| 12 | 14 | ||
| 13 | /* Documentation | 15 | /* Documentation |