From 8ce25479953a60fb9ccc2119750d755715fa60cd Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 26 Aug 1999 16:49:42 +0000 Subject: [PATCH] tree.h: fancy_abort always takes three args. 1999-08-26 09:42 -0700 Zack Weinberg * tree.h: fancy_abort always takes three args. * resource.c: Move include of system.h before toplev.h. From-SVN: r28893 --- gcc/ChangeLog | 5 +++++ gcc/resource.c | 2 +- gcc/tree.h | 7 +++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 96df4222c7f..b19980a6828 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +1999-08-26 09:42 -0700 Zack Weinberg + + * tree.h: fancy_abort always takes three args. + * resource.c: Move include of system.h before toplev.h. + Thu Aug 26 09:46:16 1999 Nick Clifton * dwarf2out.c (mem_loc_descriptor): Accept LABEL_REFs as well diff --git a/gcc/resource.c b/gcc/resource.c index b310dd654d3..daa839c54a7 100644 --- a/gcc/resource.c +++ b/gcc/resource.c @@ -19,10 +19,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "config.h" +#include "system.h" #include "toplev.h" #include "rtl.h" #include "hard-reg-set.h" -#include "system.h" #include "basic-block.h" #include "function.h" #include "regs.h" diff --git a/gcc/tree.h b/gcc/tree.h index c21ecec32d6..4e078efadda 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -2408,11 +2408,10 @@ extern void dwarf2out_end_epilogue PROTO((void)); special abort includes one or both. toplev.h gets too few files, system.h gets too many. */ -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -extern void fancy_abort PROTO((const char *, int)) ATTRIBUTE_NORETURN; -#define abort() fancy_abort (__FILE__, __LINE__) -#else extern void fancy_abort PROTO((const char *, int, const char *)) ATTRIBUTE_NORETURN; +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) +#define abort() fancy_abort (__FILE__, __LINE__, 0) +#else #define abort() fancy_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__) #endif