diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/c-decl.c | 11 | ||||
| -rw-r--r-- | gcc/c-lang.c | 8 |
3 files changed, 21 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0523ba4..93c15cb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +Wed Dec 9 15:29:26 1998 Dave Brolley <brolley@cygnus.com> + + * objc/objc-act.c (cpp_initialized): Removed. + (lang_init_options): Initialize cpplib. + (lang_decode_option): Move initialization of cpplib to + lang_init_options. + * c-lang.c: (parse_options,parse_in): Added. + (lang_init_options): Initialized cpplib here. + * c-decl.c (parse_options,cpp_initialized): Removed. + (c_decode_option): Move initialization of cpplib to + lang_init_options. + Wed Dec 9 19:36:57 1998 J"orn Rennecke <amylaar@cygnus.co.uk> * reload1.c (reload_combine, reload_combine_note_store): diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 7e10ab4..9066bea 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -37,9 +37,7 @@ Boston, MA 02111-1307, USA. */ #if USE_CPPLIB #include "cpplib.h" -extern cpp_reader parse_in; -extern cpp_options parse_options; -static int cpp_initialized; +extern cpp_reader parse_in; #endif /* In grokdeclarator, distinguish syntactic contexts of declarators. */ @@ -615,13 +613,6 @@ c_decode_option (argc, argv) int strings_processed; char *p = argv[0]; #if USE_CPPLIB - if (! cpp_initialized) - { - cpp_reader_init (&parse_in); - parse_in.opts = &parse_options; - cpp_options_init (&parse_options); - cpp_initialized = 1; - } strings_processed = cpp_handle_option (&parse_in, argc, argv); #else strings_processed = 0; diff --git a/gcc/c-lang.c b/gcc/c-lang.c index 6e04bd7..ed2b9e4 100644 --- a/gcc/c-lang.c +++ b/gcc/c-lang.c @@ -29,7 +29,10 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #if USE_CPPLIB +#include "cpplib.h" extern char *yy_cur; +extern cpp_reader parse_in; +extern cpp_options parse_options; #endif /* Each of the functions defined here @@ -46,6 +49,11 @@ lang_decode_option (argc, argv) void lang_init_options () { +#if USE_CPPLIB + cpp_reader_init (&parse_in); + parse_in.opts = &parse_options; + cpp_options_init (&parse_options); +#endif } void |