summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2006-12-10 02:52:19 +0000
committerDenis Vlasenko2006-12-10 02:52:19 +0000
commit2ea630f9a50b439181aedb0a5d837d319deed9f5 (patch)
tree45ca2d70e7a570de52267d55554875ef7003939b
parent2f8f71b20dbce1328a5175bb75ae15564f7e9489 (diff)
downloadbusybox-2ea630f9a50b439181aedb0a5d837d319deed9f5.zip
busybox-2ea630f9a50b439181aedb0a5d837d319deed9f5.tar.gz
bb_makedev: fix for glibc 2.3.2
sed: fix C++ style declaration
-rw-r--r--editors/sed.c6
-rw-r--r--libbb/makedev.c1
-rw-r--r--miscutils/nmeter.c1
3 files changed, 4 insertions, 4 deletions
diff --git a/editors/sed.c b/editors/sed.c
index 877d1c4..ac3d8d4 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 09ed728..4903e47 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 326d7b8..b098771 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 };