bb_makedev: fix for glibc 2.3.2

sed: fix C++ style declaration

diff --git a/editors/sed.c b/editors/sed.c
index 877d1c420bed215539a3fc7904eebe7b93910033..ac3d8d4635beb2a3433a987e3158810fff770c0f 100644 (file)
--- 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 09ed7287d4c5a9514d90f7d9530bd4057abd824a..4903e47836d112b15fcba87f52171d46f5f2b78e 100644 (file)
--- 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 326d7b85f1c63b1f1a618790bb817db15471cb09..b09877137aa00a31711333969679b47cc01e5efb 100644 (file)
--- 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 };