summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch at tkos.co.il>2014-12-17 16:02:37 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2014-12-17 16:02:37 (GMT)
commite835afadfe84a820b698f715a01e777f8b7bf833 (patch)
tree67d025d5553d16c299e37b9e7c5b74ac0adbd2cc
parent20cd31a2d7cc1b633b725280eb7546ca14eef7eb (diff)
downloadbusybox-refs/heads/master.tar.gz
busybox-refs/heads/master.tar.bz2
nandwrite: fix build when long options are disabledHEADmaster
The Required_argument macro is only defined when long options are enabled. Fixes the following build error: miscutils/nandwrite.c: In function 'nandwrite_main': miscutils/nandwrite.c:120:10: error: expected ',' or ';' before 'Required_argument' Reported-by: Christian Kästner <kaestner at cs.cmu.edu> Signed-off-by: Baruch Siach <baruch at tkos.co.il> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/nandwrite.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 29ff351..c825fc3 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -116,12 +116,13 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
struct mtd_oob_buf oob;
unsigned char *filebuf;
const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb;
- static const char nanddump_longopts[] ALIGN1 =
- "bb\0" Required_argument "\xff"; /* no short equivalent */
if (IS_NANDDUMP) {
opt_complementary = "=1";
- applet_long_options = nanddump_longopts;
+#if ENABLE_LONG_OPTS
+ applet_long_options =
+ "bb\0" Required_argument "\xff"; /* no short equivalent */
+#endif
opts = getopt32(argv, "os:f:l:", &opt_s, &opt_f, &opt_l, &opt_bb);
} else { /* nandwrite */
opt_complementary = "-1:?2";