diff options
author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-21 18:46:42 +0000 |
---|---|---|
committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-21 18:46:42 +0000 |
commit | b6d18b0a8cdc63b7c3ad9e79b08ad01d7cb4294d (patch) | |
tree | 3ea24655d8eabfdaf624b6cb32ed7b761c98617f /gcc/cppmacro.c | |
parent | 7e2fc40e1287c0eb718f1f0f5921ead11593a829 (diff) | |
download | gcc-b6d18b0a8cdc63b7c3ad9e79b08ad01d7cb4294d.tar.gz |
* cppexp.c (struct op, parse_number): Replace U_CHAR with uchar.
* cppfiles.c (read_include_file): Similarly.
* cpphash.h (DSC, U_CHAR, ustrcmp, ustrncmp, ustrlen,
uxstrdup ustrchr, ufputs): Similarly.
* cppinit.c (TRIGRAPH_MAP, cpp_destroy): Similarly.
* cpplex.c (parse_slow, unescaped_terminator_p, save_comment,
cpp_ideq, parse_identifier, parse_number): Similarly.
* cpplib.c (struct directive, dequote_string, D, run_directive,
cpp_push_buffer): Similarly.
* cppmacro.c (new_string_token, builtin_macro, cpp_quote_string,
_cpp_create_definition, check_trad_stringification,
cpp_macro_definition): Similarly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@52587 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cppmacro.c')
-rw-r--r-- | gcc/cppmacro.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c index d39bd45ff25..aa2e58bf02d 100644 --- a/gcc/cppmacro.c +++ b/gcc/cppmacro.c @@ -64,7 +64,7 @@ static cpp_context *next_context PARAMS ((cpp_reader *)); static const cpp_token *padding_token PARAMS ((cpp_reader *, const cpp_token *)); static void expand_arg PARAMS ((cpp_reader *, macro_arg *)); -static const cpp_token *new_string_token PARAMS ((cpp_reader *, U_CHAR *, +static const cpp_token *new_string_token PARAMS ((cpp_reader *, uchar *, unsigned int)); static const cpp_token *new_number_token PARAMS ((cpp_reader *, unsigned int)); static const cpp_token *stringify_arg PARAMS ((cpp_reader *, macro_arg *)); @@ -152,7 +152,7 @@ builtin_macro (pfile, node) { unsigned int len; const char *name; - U_CHAR *buf; + uchar *buf; const struct line_map *map = pfile->map; if (node->value.builtin == BT_BASE_FILE) @@ -244,15 +244,15 @@ builtin_macro (pfile, node) backslashes and double quotes. Non-printable characters are converted to octal. DEST must be of sufficient size. Returns a pointer to the end of the string. */ -U_CHAR * +uchar * cpp_quote_string (dest, src, len) - U_CHAR *dest; - const U_CHAR *src; + uchar *dest; + const uchar *src; unsigned int len; { while (len--) { - U_CHAR c = *src++; + uchar c = *src++; if (c == '\\' || c == '"') { @@ -1340,7 +1340,7 @@ _cpp_create_definition (pfile, node) goto cleanup2; /* Success. Commit the parameter array. */ - BUFF_FRONT (pfile->a_buff) = (U_CHAR *) ¯o->params[macro->paramc]; + BUFF_FRONT (pfile->a_buff) = (uchar *) ¯o->params[macro->paramc]; macro->fun_like = 1; } else if (ctoken->type != CPP_EOF && !(ctoken->flags & PREV_WHITE)) @@ -1416,7 +1416,7 @@ _cpp_create_definition (pfile, node) macro->expansion[0].flags &= ~PREV_WHITE; /* Commit the memory. */ - BUFF_FRONT (pfile->a_buff) = (U_CHAR *) ¯o->expansion[macro->count]; + BUFF_FRONT (pfile->a_buff) = (uchar *) ¯o->expansion[macro->count]; /* Implement the macro-defined-to-itself optimisation. */ if (macro->count == 1 && !macro->fun_like @@ -1474,7 +1474,7 @@ check_trad_stringification (pfile, macro, string) const cpp_string *string; { unsigned int i, len; - const U_CHAR *p, *q, *limit = string->text + string->len; + const uchar *p, *q, *limit = string->text + string->len; /* Loop over the string. */ for (p = string->text; p < limit; p = q) @@ -1555,7 +1555,7 @@ cpp_macro_definition (pfile, node) if (len > pfile->macro_buffer_len) { - pfile->macro_buffer = (U_CHAR *) xrealloc (pfile->macro_buffer, len); + pfile->macro_buffer = (uchar *) xrealloc (pfile->macro_buffer, len); pfile->macro_buffer_len = len; } |