bb_makedev: fix for glibc 2.3.2

sed: fix C++ style declaration


git-svn-id: svn://busybox.net/trunk/busybox@16831 69ca8d6d-28ef-0310-b511-8ec308f3f277

3 files changed, 4 insertions, 4 deletions

diff --git a/editors/sed.c b/editors/sed.c
index 877d1c420..ac3d8d463 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -796,15 +796,15 @@ static void process_files(void)
         char *pattern_space, *next_line;
         int linenum = 0, prev_last_char = 0;
         int last_char, next_last_char = 0;
+        sed_cmd_t *sed_cmd;
+        int substituted;
 
         /* Prime the pump */
         next_line = get_next_line(&next_last_char);
 
         /* go through every line in each file */
 again:
-
-        sed_cmd_t *sed_cmd;
-        int substituted = 0;
+        substituted = 0;
 
         /* Advance to next line.  Stop if out of lines. */
         pattern_space = next_line;
diff --git a/libbb/makedev.c b/libbb/makedev.c
index 09ed7287d..4903e4783 100644
--- a/libbb/makedev.c
+++ b/libbb/makedev.c
@@ -7,6 +7,7 @@
  */
 
 /* We do not include libbb.h - #define makedev() is there! */
+#include <features.h>
 #include <sys/sysmacros.h>
 
 #ifdef __GLIBC__
diff --git a/miscutils/nmeter.c b/miscutils/nmeter.c
index 326d7b85f..b09877137 100644
--- a/miscutils/nmeter.c
+++ b/miscutils/nmeter.c
@@ -16,7 +16,6 @@
 #include <time.h>
 
 typedef unsigned long long ullong;
-typedef unsigned long ulong;
 
 enum { proc_file_size = 4096 };