bb_makedev: fix for glibc 2.3.2
sed: fix C++ style declaration
This commit is contained in:
parent
2f8f71b20d
commit
2ea630f9a5
@ -796,15 +796,15 @@ static void process_files(void)
|
|||||||
char *pattern_space, *next_line;
|
char *pattern_space, *next_line;
|
||||||
int linenum = 0, prev_last_char = 0;
|
int linenum = 0, prev_last_char = 0;
|
||||||
int last_char, next_last_char = 0;
|
int last_char, next_last_char = 0;
|
||||||
|
sed_cmd_t *sed_cmd;
|
||||||
|
int substituted;
|
||||||
|
|
||||||
/* Prime the pump */
|
/* Prime the pump */
|
||||||
next_line = get_next_line(&next_last_char);
|
next_line = get_next_line(&next_last_char);
|
||||||
|
|
||||||
/* go through every line in each file */
|
/* go through every line in each file */
|
||||||
again:
|
again:
|
||||||
|
substituted = 0;
|
||||||
sed_cmd_t *sed_cmd;
|
|
||||||
int substituted = 0;
|
|
||||||
|
|
||||||
/* Advance to next line. Stop if out of lines. */
|
/* Advance to next line. Stop if out of lines. */
|
||||||
pattern_space = next_line;
|
pattern_space = next_line;
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* We do not include libbb.h - #define makedev() is there! */
|
/* We do not include libbb.h - #define makedev() is there! */
|
||||||
|
#include <features.h>
|
||||||
#include <sys/sysmacros.h>
|
#include <sys/sysmacros.h>
|
||||||
|
|
||||||
#ifdef __GLIBC__
|
#ifdef __GLIBC__
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
typedef unsigned long long ullong;
|
typedef unsigned long long ullong;
|
||||||
typedef unsigned long ulong;
|
|
||||||
|
|
||||||
enum { proc_file_size = 4096 };
|
enum { proc_file_size = 4096 };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user