Merge branch 'busybox' into merge

Conflicts:
	include/libbb.h
	shell/ash.c

2 files changed, 7 insertions, 1 deletions

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 8497722ba..7a6f22b03 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -25,7 +25,7 @@
 
 //usage:#if ENABLE_DESKTOP
 //usage:#define od_trivial_usage
-//usage:       "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE...]"
+//usage:       "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE]..."
 // We don't support:
 // ... [FILE] [[+]OFFSET[.][b]]
 // Support is buggy for:
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 2797719dd..3fb212f0f 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -99,9 +99,15 @@ static const char *file_type(const struct stat *st)
         if (S_ISFIFO(st->st_mode)) return "fifo";
         if (S_ISLNK(st->st_mode))  return "symbolic link";
         if (S_ISSOCK(st->st_mode)) return "socket";
+#ifdef S_TYPEISMQ
         if (S_TYPEISMQ(st))        return "message queue";
+#endif
+#ifdef S_TYPEISSEM
         if (S_TYPEISSEM(st))       return "semaphore";
+#endif
+#ifdef S_TYPEISSHM
         if (S_TYPEISSHM(st))       return "shared memory object";
+#endif
 #ifdef S_TYPEISTMO
         if (S_TYPEISTMO(st))       return "typed memory object";
 #endif