From 6c8e6d0c5c8dc5f82bf1e5bcdffd413810cbb52b Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Fri, 7 Jun 1996 00:32:01 -0700 Subject: [PATCH] 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 --- gcc/cppmain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/cppmain.c b/gcc/cppmain.c index 50e31be85d6..d818278e82e 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -34,6 +34,7 @@ char *progname; cpp_reader parse_in; cpp_options options; +#ifdef abort /* More 'friendly' abort that prints the line and file. config.h can #define abort fancy_abort if you like that sort of thing. */ @@ -42,6 +43,7 @@ fancy_abort () { fatal ("Internal gcc abort."); } +#endif int @@ -64,10 +66,10 @@ main (argc, argv) cpp_options_init (opts); 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)) exit (FATAL_EXIT_CODE); - if (argi < argc) - cpp_fatal (&parse_in, "Invalid option `%s'", argv[argi]); parse_in.show_column = 1; -- 2.30.2