diff options
Diffstat (limited to 'libcpp/directives.c')
| -rw-r--r-- | libcpp/directives.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libcpp/directives.c b/libcpp/directives.c index 0ca1117c19a..3478cd5047a 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -188,7 +188,7 @@ DIRECTIVE_TABLE did use this notation in its preprocessed output. */ static const directive linemarker_dir = { - do_linemarker, U"#", 1, KANDR, IN_I + do_linemarker, UC"#", 1, KANDR, IN_I }; #define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF) @@ -697,7 +697,7 @@ parse_include (cpp_reader *pfile, int *pangle_brackets, const unsigned char *dir; if (pfile->directive == &dtable[T_PRAGMA]) - dir = U"pragma dependency"; + dir = UC"pragma dependency"; else dir = pfile->directive->name; cpp_error (pfile, CPP_DL_ERROR, "#%s expects \"FILENAME\" or <FILENAME>", @@ -1085,7 +1085,7 @@ register_pragma_1 (cpp_reader *pfile, const char *space, const char *name, if (space) { - node = cpp_lookup (pfile, U space, strlen (space)); + node = cpp_lookup (pfile, UC space, strlen (space)); entry = lookup_pragma_entry (*chain, node); if (!entry) { @@ -1114,7 +1114,7 @@ register_pragma_1 (cpp_reader *pfile, const char *space, const char *name, } /* Check for duplicates. */ - node = cpp_lookup (pfile, U name, strlen (name)); + node = cpp_lookup (pfile, UC name, strlen (name)); entry = lookup_pragma_entry (*chain, node); if (entry == NULL) { @@ -1262,7 +1262,7 @@ restore_registered_pragmas (cpp_reader *pfile, struct pragma_entry *pe, { if (pe->is_nspace) sd = restore_registered_pragmas (pfile, pe->u.space, sd); - pe->pragma = cpp_lookup (pfile, U *sd, strlen (*sd)); + pe->pragma = cpp_lookup (pfile, UC *sd, strlen (*sd)); free (*sd); sd++; } @@ -1491,7 +1491,8 @@ get__Pragma_string (cpp_reader *pfile) string = get_token_no_padding (pfile); if (string->type == CPP_EOF) _cpp_backup_tokens (pfile, 1); - if (string->type != CPP_STRING && string->type != CPP_WSTRING) + if (string->type != CPP_STRING && string->type != CPP_WSTRING + && string->type != CPP_STRING32 && string->type != CPP_STRING16) return NULL; paren = get_token_no_padding (pfile); |