Commit 6c8e6d0c by Per Bothner

cppmain.c (fancy_abort): Only define #ifdef abort.

* cppmain.c (fancy_abort):  Only define #ifdef abort.
(main):  Make sure cpp_fatal is before exit.

From-SVN: r12209
parent c8fb2307
...@@ -34,6 +34,7 @@ char *progname; ...@@ -34,6 +34,7 @@ char *progname;
cpp_reader parse_in; cpp_reader parse_in;
cpp_options options; cpp_options options;
#ifdef abort
/* More 'friendly' abort that prints the line and file. /* More 'friendly' abort that prints the line and file.
config.h can #define abort fancy_abort if you like that sort of thing. */ config.h can #define abort fancy_abort if you like that sort of thing. */
...@@ -42,6 +43,7 @@ fancy_abort () ...@@ -42,6 +43,7 @@ fancy_abort ()
{ {
fatal ("Internal gcc abort."); fatal ("Internal gcc abort.");
} }
#endif
int int
...@@ -64,10 +66,10 @@ main (argc, argv) ...@@ -64,10 +66,10 @@ main (argc, argv)
cpp_options_init (opts); cpp_options_init (opts);
argi += cpp_handle_options (&parse_in, argc - argi , argv + argi); argi += cpp_handle_options (&parse_in, argc - argi , argv + argi);
if (argi < argc && ! CPP_FATAL_ERRORS (&parse_in))
cpp_fatal (&parse_in, "Invalid option `%s'", argv[argi]);
if (CPP_FATAL_ERRORS (&parse_in)) if (CPP_FATAL_ERRORS (&parse_in))
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
if (argi < argc)
cpp_fatal (&parse_in, "Invalid option `%s'", argv[argi]);
parse_in.show_column = 1; parse_in.show_column = 1;
......
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