Merge branch 'busybox' into merge

2 files changed, 7 insertions, 1 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 1d77aefb7..b92c2324e 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -334,7 +334,9 @@ int conf_write(const char *name)
         struct symbol *sym;
         struct menu *menu;
         const char *basename;
-        char dirname[128], tmpname[128], newname[128];
+        char dirname[128];
+        char tmpname[256];
+        char newname[256];
         int type, l;
         const char *str;
         time_t now;
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d3ad12d90..9fc837c9f 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -31,6 +31,10 @@
 #include <unistd.h>
 #include <locale.h>
 
+#ifndef SIGWINCH
+#define SIGWINCH 28
+#endif
+
 #define LKC_DIRECT_LINK
 #include "lkc.h"