Commit 5d7da2c6 by Dave Brolley Committed by Dave Brolley

c-lang.c: (parse_options,parse_in): Added.

Wed Dec  9 15:29:26 1998  Dave Brolley  <brolley@cygnus.com>
	* 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.

From-SVN: r24219
parent 33964bf4
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> Wed Dec 9 19:36:57 1998 J"orn Rennecke <amylaar@cygnus.co.uk>
* reload1.c (reload_combine, reload_combine_note_store): * reload1.c (reload_combine, reload_combine_note_store):
......
...@@ -38,8 +38,6 @@ Boston, MA 02111-1307, USA. */ ...@@ -38,8 +38,6 @@ Boston, MA 02111-1307, USA. */
#if USE_CPPLIB #if USE_CPPLIB
#include "cpplib.h" #include "cpplib.h"
extern cpp_reader parse_in; extern cpp_reader parse_in;
extern cpp_options parse_options;
static int cpp_initialized;
#endif #endif
/* In grokdeclarator, distinguish syntactic contexts of declarators. */ /* In grokdeclarator, distinguish syntactic contexts of declarators. */
...@@ -615,13 +613,6 @@ c_decode_option (argc, argv) ...@@ -615,13 +613,6 @@ c_decode_option (argc, argv)
int strings_processed; int strings_processed;
char *p = argv[0]; char *p = argv[0];
#if USE_CPPLIB #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); strings_processed = cpp_handle_option (&parse_in, argc, argv);
#else #else
strings_processed = 0; strings_processed = 0;
......
...@@ -29,7 +29,10 @@ Boston, MA 02111-1307, USA. */ ...@@ -29,7 +29,10 @@ Boston, MA 02111-1307, USA. */
#include "output.h" #include "output.h"
#if USE_CPPLIB #if USE_CPPLIB
#include "cpplib.h"
extern char *yy_cur; extern char *yy_cur;
extern cpp_reader parse_in;
extern cpp_options parse_options;
#endif #endif
/* Each of the functions defined here /* Each of the functions defined here
...@@ -46,6 +49,11 @@ lang_decode_option (argc, argv) ...@@ -46,6 +49,11 @@ lang_decode_option (argc, argv)
void void
lang_init_options () lang_init_options ()
{ {
#if USE_CPPLIB
cpp_reader_init (&parse_in);
parse_in.opts = &parse_options;
cpp_options_init (&parse_options);
#endif
} }
void void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment