Merge branch 'busybox' into merge

2 files changed, 3 insertions, 7 deletions

diff --git a/findutils/find.c b/findutils/find.c
index bd7ccc323..a0d4853de 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -423,9 +423,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { \
-        struct G_sizecheck { \
-                char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-        }; \
+        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
         /* we have to zero it out because of NOEXEC */ \
         memset(&G, 0, sizeof(G)); \
         IF_FEATURE_FIND_MAXDEPTH(G.minmaxdepth[1] = INT_MAX;) \
@@ -884,7 +882,7 @@ static int find_type(const char *type)
                 mask = S_IFSOCK;
 
         if (mask == 0 || type[1] != '\0')
-                bb_error_msg_and_die(bb_msg_invalid_arg, type, "-type");
+                bb_error_msg_and_die(bb_msg_invalid_arg_to, type, "-type");
 
         return mask;
 }
diff --git a/findutils/grep.c b/findutils/grep.c
index 0336b2927..e163e6562 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -211,9 +211,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { \
-        struct G_sizecheck { \
-                char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-        }; \
+        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 #define max_matches       (G.max_matches         )
 #if !ENABLE_EXTRA_COMPAT