diff options
author | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
commit | e5e809f4194e578b5fbd48fc5a1df2377f28d197 (patch) | |
tree | 6743f11e58bd7a933b08900d973d89026cd11c43 /gcc/gbl-ctors.h | |
parent | 31031eddacda46a500b2390f52cd4474bcaf84ca (diff) | |
download | gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.zip gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.gz gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.bz2 |
* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12
for details.
* haifa-sched.c: Mirror recent changes from gcc2.
From-SVN: r18984
Diffstat (limited to 'gcc/gbl-ctors.h')
-rw-r--r-- | gcc/gbl-ctors.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/gbl-ctors.h b/gcc/gbl-ctors.h index 6393a90..50e0e56 100644 --- a/gcc/gbl-ctors.h +++ b/gcc/gbl-ctors.h @@ -2,7 +2,7 @@ for getting g++ file-scope static objects constructed. This file will get included either by libgcc2.c (for systems that don't support a .init section) or by crtstuff.c (for those that do). - Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1991, 1995, 1996, 1998 Free Software Foundation, Inc. Contributed by Ron Guilmette (rfg@segfault.us.com) This file is part of GNU CC. @@ -39,8 +39,6 @@ Boston, MA 02111-1307, USA. */ #ifdef HAVE_ATEXIT #if defined (WINNT) || defined (NEED_ATEXIT) extern int atexit (void (*) (void)); -#else -extern void atexit (void (*) (void)); #endif #define ON_EXIT(FUNC,ARG) atexit ((FUNC)) #else |