Merge branch 'busybox' into merge

2 files changed, 1 insertions, 4 deletions

diff --git a/include/.gitignore b/include/.gitignore
index 9d9b6c499..75afff9ca 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -8,3 +8,4 @@
 /NUM_APPLETS.h
 /usage_compressed.h
 /usage.h
+/common_bufsiz.h*
diff --git a/include/libbb.h b/include/libbb.h
index ffe1504e1..9a7590edd 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1852,10 +1852,6 @@ extern const char bb_PATH_root_path[] ALIGN1; /* "PATH=/sbin:/usr/sbin:/bin:/usr
 extern const int const_int_0;
 //extern const int const_int_1;
 
-
-/* Providing hard guarantee on minimum size (think of BUFSIZ == 128) */
-enum { COMMON_BUFSIZE = (BUFSIZ >= 256*sizeof(void*) ? BUFSIZ+1 : 256*sizeof(void*)) };
-extern char bb_common_bufsiz1[COMMON_BUFSIZE];
 /* This struct is deliberately not defined. */
 /* See docs/keep_data_small.txt */
 struct globals;