Merge branch 'busybox' into merge

3 files changed, 5 insertions, 5 deletions

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 50ca1ccea..ee40af50b 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -121,14 +121,12 @@ int cp_main(int argc, char **argv)
         int d_flags;
         int flags;
         int status;
-        enum {
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
+        enum {
                 /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTBITS */
                 OPT_parents = 1 << (FILEUTILS_CP_OPTBITS+1),
                 OPT_reflink = 1 << (FILEUTILS_CP_OPTBITS+2),
-#endif
         };
-#if ENABLE_FEATURE_CP_LONG_OPTIONS
 # if ENABLE_FEATURE_CP_REFLINK
         char *reflink = NULL;
 # endif
diff --git a/coreutils/dd.c b/coreutils/dd.c
index b476ed24f..a3c9ababf 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -56,8 +56,8 @@
 //kbuild:lib-$(CONFIG_DD) += dd.o
 
 //usage:#define dd_trivial_usage
-//usage:       "[if=FILE] [of=FILE] [" IF_FEATURE_DD_IBS_OBS("ibs=N obs=N/") "bs=N] [count=N] [skip=N] [seek=N]\n"
-//usage:        IF_FEATURE_DD_IBS_OBS(
+//usage:       "[if=FILE] [of=FILE] [" IF_FEATURE_DD_IBS_OBS("ibs=N obs=N/") "bs=N] [count=N] [skip=N] [seek=N]"
+//usage:        IF_FEATURE_DD_IBS_OBS("\n"
 //usage:       "        [conv=notrunc|noerror|sync|fsync]\n"
 //usage:       "        [iflag=skip_bytes|count_bytes|fullblock|direct] [oflag=seek_bytes|append|direct]"
 //usage:        )
diff --git a/coreutils/touch.c b/coreutils/touch.c
index ec12eb7cf..78100ba1d 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -127,6 +127,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
 #endif
         );
 
+#if ENABLE_FEATURE_TOUCH_SUSV3
         timebuf[0].tv_nsec = timebuf[1].tv_nsec = UTIME_NOW;
         if (opts & OPT_r) {
                 struct stat stbuf;
@@ -160,6 +161,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
                 timebuf[1].tv_nsec = UTIME_OMIT;
         if ((opts & (OPT_a|OPT_m)) == OPT_m)
                 timebuf[0].tv_nsec = UTIME_OMIT;
+#endif
 
         argv += optind;
         do {