diff options
author | Paolo Bonzini <bonzini@gnu.org> | 2009-04-30 10:47:30 +0200 |
---|---|---|
committer | Paolo Bonzini <bonzini@gnu.org> | 2009-04-30 10:47:30 +0200 |
commit | af03c28be22977ae4a397437cb93012ccd9cf1a7 (patch) | |
tree | bd9de09338cb4a01091056698c78a3e53040f5a6 | |
parent | 4381be08bd6b4acf9ff808018fc197c12cb26ef7 (diff) | |
download | sed-af03c28be22977ae4a397437cb93012ccd9cf1a7.tar.gz |
declare bool arguments as int instead to please AIX XLC
2009-04-30 Paolo Bonzini <bonzini@gnu.org>
* sed/compile.c: Declare bool arguments as int instead to please AIX XLC.
* sed/execute.c: Declare bool arguments as int instead to please AIX XLC.
* sed/utils.c: Declare bool arguments as int instead to please AIX XLC.
* sed/utils.h: Declare bool arguments as int instead to please AIX XLC.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sed/compile.c | 4 | ||||
-rw-r--r-- | sed/execute.c | 20 | ||||
-rw-r--r-- | sed/utils.c | 6 | ||||
-rw-r--r-- | sed/utils.h | 4 |
5 files changed, 24 insertions, 17 deletions
@@ -1,3 +1,10 @@ +2009-04-30 Paolo Bonzini <bonzini@gnu.org> + + * sed/compile.c: Declare bool arguments as int instead to please AIX XLC. + * sed/execute.c: Declare bool arguments as int instead to please AIX XLC. + * sed/utils.c: Declare bool arguments as int instead to please AIX XLC. + * sed/utils.h: Declare bool arguments as int instead to please AIX XLC. + 2009-04-27 Paolo Bonzini <bonzini@gnu.org> * configure.ac: Bump version number. diff --git a/sed/compile.c b/sed/compile.c index e0a47a8..f48f8ec 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -527,11 +527,11 @@ snarf_char_class(b, cur_stat) } } -static struct buffer *match_slash P_((int slash, bool regex)); +static struct buffer *match_slash P_((int slash, int regex)); static struct buffer * match_slash(slash, regex) int slash; - bool regex; + int regex; { struct buffer *b; int ch; diff --git a/sed/execute.c b/sed/execute.c index 1c11cf8..3b4d5da 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -421,12 +421,12 @@ line_reset(buf, state) /* Copy the contents of the line `from' into the line `to'. This destroys the old contents of `to'. Copy the multibyte state if `state' is true. */ -static void line_copy P_((struct line *from, struct line *to, bool state)); +static void line_copy P_((struct line *from, struct line *to, int state)); static void line_copy(from, to, state) struct line *from; struct line *to; - bool state; + int state; { /* Remove the inactive portion in the destination buffer. */ to->alloc += to->active - to->text; @@ -457,12 +457,12 @@ line_copy(from, to, state) /* Append the contents of the line `from' to the line `to'. Copy the multibyte state if `state' is true. */ -static void line_append P_((struct line *from, struct line *to, bool state)); +static void line_append P_((struct line *from, struct line *to, int state)); static void line_append(from, to, state) struct line *from; struct line *to; - bool state; + int state; { str_append(to, "\n", 1); str_append(to, from->active, from->length); @@ -476,12 +476,12 @@ line_append(from, to, state) /* Exchange two "struct line" buffers. Copy the multibyte state if `state' is true. */ -static void line_exchange P_((struct line *a, struct line *b, bool state)); +static void line_exchange P_((struct line *a, struct line *b, int state)); static void line_exchange(a, b, state) struct line *a; struct line *b; - bool state; + int state; { struct line t; @@ -553,12 +553,12 @@ flush_output(fp) ck_fflush(fp); } -static void output_line P_((const char *, size_t, bool, struct output *)); +static void output_line P_((const char *, size_t, int, struct output *)); static void output_line(text, length, nl, outf) const char *text; size_t length; - bool nl; + int nl; struct output *outf; { if (!text) @@ -804,12 +804,12 @@ reset_addresses(vec) /* Read in the next line of input, and store it in the pattern space. Return zero if there is nothing left to input. */ -static bool read_pattern_space P_((struct input *, struct vector *, bool)); +static bool read_pattern_space P_((struct input *, struct vector *, int)); static bool read_pattern_space(input, the_program, append) struct input *input; struct vector *the_program; - bool append; + int append; { if (append_head) /* redundant test to optimize for common case */ dump_append_queue(); diff --git a/sed/utils.c b/sed/utils.c index 94c4644..87ea101 100644 --- a/sed/utils.c +++ b/sed/utils.c @@ -125,7 +125,7 @@ static void register_open_file (fp, name, temp) FILE *fp; const char *name; - bool temp; + int temp; { struct open_file *p; for (p=open_files; p; p=p->link) @@ -152,7 +152,7 @@ FILE * ck_fopen(name, mode, fail) const char *name; const char *mode; - bool fail; + int fail; { FILE *fp; @@ -175,7 +175,7 @@ ck_fdopen(fd, name, mode, fail) int fd; const char *name; const char *mode; - bool fail; + int fail; { FILE *fp; diff --git a/sed/utils.h b/sed/utils.h index d3130fb..d3f431d 100644 --- a/sed/utils.h +++ b/sed/utils.h @@ -22,8 +22,8 @@ void panic P_((const char *str, ...)); -FILE *ck_fopen P_((const char *name, const char *mode, bool fail)); -FILE *ck_fdopen P_((int fd, const char *name, const char *mode, bool fail)); +FILE *ck_fopen P_((const char *name, const char *mode, int fail)); +FILE *ck_fdopen P_((int fd, const char *name, const char *mode, int fail)); void ck_fwrite P_((const VOID *ptr, size_t size, size_t nmemb, FILE *stream)); size_t ck_fread P_((VOID *ptr, size_t size, size_t nmemb, FILE *stream)); void ck_fflush P_((FILE *stream)); |