tree.h: fancy_abort always takes three args.

1999-08-26 09:42 -0700  Zack Weinberg  <zack@bitmover.com>

	* tree.h: fancy_abort always takes three args.
	* resource.c: Move include of system.h before toplev.h.

From-SVN: r28893

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96df4222c7fb5504893f3cc05982ad772a20e710..b19980a6828c70aaee150f8cb6d3c392ba65c90a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-26 09:42 -0700  Zack Weinberg  <zack@bitmover.com>
+
+       * 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  <nickc@cygnus.com>
 
        * dwarf2out.c (mem_loc_descriptor): Accept LABEL_REFs as well

diff --git a/gcc/resource.c b/gcc/resource.c
index b310dd654d336cabe1e9208033111459e6202e34..daa839c54a71669737076b1c72483720c3bd9a76 100644 (file)
--- 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 c21ecec32d6ec627e0a4f0e514f44cbaf7a8f6d9..4e078efadda461e00e24eb90811d0a53318b6d27 100644 (file)
--- 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