Merge branch 'busybox' into merge

1 files changed, 2 insertions, 5 deletions

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 513c8ef37..df7354b7b 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -61,8 +61,8 @@ enum {
         OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS,
 };
 
-#define OD_GETOPT32() getopt32(argv, \
-        "A:N:abcdfhij:lot:*vxsS:w:+:", \
+#define OD_GETOPT32() getopt32long(argv, \
+        "A:N:abcdfhij:lot:*vxsS:w:+:", od_longopts, \
         /* -w with optional param */ \
         /* -S was -s and also had optional parameter */ \
         /* but in coreutils 6.3 it was renamed and now has */ \
@@ -1220,9 +1220,6 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         address_pad_len_char = '7';
 
         /* Parse command line */
-#if ENABLE_LONG_OPTS
-        applet_long_options = od_longopts;
-#endif
         opt = OD_GETOPT32();
         argv += optind;
         if (opt & OPT_A) {