svn commit: trunk/busybox: editors libbb miscutils

[vda at busybox.net]

Author: vda
Date: 2006-12-09 18:52:19 -0800 (Sat, 09 Dec 2006)
New Revision: 16831

Log:
bb_makedev: fix for glibc 2.3.2
sed: fix C++ style declaration


Modified:
   trunk/busybox/editors/sed.c
   trunk/busybox/libbb/makedev.c
   trunk/busybox/miscutils/nmeter.c


Changeset:
Modified: trunk/busybox/editors/sed.c
===================================================================
--- trunk/busybox/editors/sed.c	2006-12-10 02:09:12 UTC (rev 16830)
+++ trunk/busybox/editors/sed.c	2006-12-10 02:52:19 UTC (rev 16831)
@@ -796,16 +796,16 @@
 	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:
+	substituted = 0;
 
-	sed_cmd_t *sed_cmd;
-	int substituted = 0;
-
 	/* Advance to next line.  Stop if out of lines. */
 	pattern_space = next_line;
 	if (!pattern_space) return;

Modified: trunk/busybox/libbb/makedev.c
===================================================================
--- trunk/busybox/libbb/makedev.c	2006-12-10 02:09:12 UTC (rev 16830)
+++ trunk/busybox/libbb/makedev.c	2006-12-10 02:52:19 UTC (rev 16831)
@@ -7,6 +7,7 @@
  */
 
 /* We do not include libbb.h - #define makedev() is there! */
+#include <features.h>
 #include <sys/sysmacros.h>
 
 #ifdef __GLIBC__

Modified: trunk/busybox/miscutils/nmeter.c
===================================================================
--- trunk/busybox/miscutils/nmeter.c	2006-12-10 02:09:12 UTC (rev 16830)
+++ trunk/busybox/miscutils/nmeter.c	2006-12-10 02:52:19 UTC (rev 16831)
@@ -16,7 +16,6 @@
 #include <time.h>
 
 typedef unsigned long long ullong;
-typedef unsigned long ulong;
 
 enum { proc_file_size = 4096 };