diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-05-29 04:24:13 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-05-29 04:24:52 +0200 |
commit | 488dd7086925b83bb36568965558221e04d2cc91 (patch) | |
tree | 2c4ee47019880b24cb308eef3eb6f9fd211fbafb /util-linux | |
parent | 217a7f4bf95339a93a217c5806c5b9a48c0027d5 (diff) | |
download | busybox-w32-488dd7086925b83bb36568965558221e04d2cc91.tar.gz busybox-w32-488dd7086925b83bb36568965558221e04d2cc91.tar.bz2 busybox-w32-488dd7086925b83bb36568965558221e04d2cc91.zip |
fix !ENABLE_FEATURE_GETOPT_LONG build. Closes 3775
When compiling with !ENABLE_FEATURE_GETOPT_LONG, busybox still tries
to include getopt.h which is not available; for example with uClibc
when !UCLIBC_HAS_GETOPT_LONG. getopt.h is only required
for the _long set of functions.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/getopt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 10e1dc49b..85ff76189 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Added NLS support (partly written by Arkadiusz Mickiewicz | 25 | * Added NLS support (partly written by Arkadiusz Mickiewicz |
26 | * <misiek@misiek.eu.org>) | 26 | * <misiek@misiek.eu.org>) |
27 | * Ported to Busybox - Alfred M. Szmidt <ams@trillian.itslinux.org> | 27 | * Ported to Busybox - Alfred M. Szmidt <ams@trillian.itslinux.org> |
28 | * Removed --version/-V and --help/-h in | 28 | * Removed --version/-V and --help/-h |
29 | * Removed parse_error(), using bb_error_msg() from Busybox instead | 29 | * Removed parse_error(), using bb_error_msg() from Busybox instead |
30 | * Replaced our_malloc with xmalloc and our_realloc with xrealloc | 30 | * Replaced our_malloc with xmalloc and our_realloc with xrealloc |
31 | * | 31 | * |
@@ -79,7 +79,9 @@ | |||
79 | //usage: " esac\n" | 79 | //usage: " esac\n" |
80 | //usage: "done\n" | 80 | //usage: "done\n" |
81 | 81 | ||
82 | #include <getopt.h> | 82 | #if ENABLE_FEATURE_GETOPT_LONG |
83 | # include <getopt.h> | ||
84 | #endif | ||
83 | #include "libbb.h" | 85 | #include "libbb.h" |
84 | 86 | ||
85 | /* NON_OPT is the code that is returned when a non-option is found in '+' | 87 | /* NON_OPT is the code that is returned when a non-option is found in '+' |