From 9d10c9a9eb26bb822177b177e0f8edc7000a3b70 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Thu, 6 Mar 2003 23:12:30 +0000 Subject: Makefile.in (c-ppoutput.o): Update. * Makefile.in (c-ppoutput.o): Update. * c-common.h (init_pp_output): New. (preprocess_file): Update. * c-lex.c (init_c_lex): Move mbchar initialization to cpplib. Register builtins. * c-opts.c (c_common_init): Call init_pp_output if preprocessing. Make call to cpp_read_main_file common to whether preprocessing or not. Don't register builtins. * c-ppoutput.c: Include c-pragma.h. (setup_callbacks): Rename init_pp_output. (preprocess_file): No longer setup callbacks or call cpp_read_main_file. * cpphash.h (_cpp_init_mbchar): New. * cppinit.c (init_library): Call _cpp_init_mbchar. * cpplex.c (_cpp_init_mbchar): New. From-SVN: r63913 --- gcc/c-lex.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gcc/c-lex.c') diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 452056a..9e97ad7 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -111,14 +111,9 @@ init_c_lex () toplevel->time = body_time; } -#ifdef MULTIBYTE_CHARS - /* Change to the native locale for multibyte conversions. */ - setlocale (LC_CTYPE, ""); - GET_ENVIRONMENT (literal_codeset, "LANG"); -#endif - cb = cpp_get_callbacks (parse_in); + cb->register_builtins = cb_register_builtins; cb->line_change = cb_line_change; cb->ident = cb_ident; cb->file_change = cb_file_change; -- cgit v1.1