diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-05-15 12:22:50 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-05-15 12:22:50 +0000 |
| commit | bc5b8c65ef17547cbab9141d66798bbb3cae9c2a (patch) | |
| tree | c41d5e47bf1ebffbe2fc7461f0131e7a8b16dc49 /libc/stdlib | |
| parent | c0ce886c9f6b0580924e4f21180602f5e72d6570 (diff) | |
Merge changes between r13800 and r13831 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@13832 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/stdlib')
| -rw-r--r-- | libc/stdlib/abort.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c index 3c188c951..e9d0ab18f 100644 --- a/libc/stdlib/abort.c +++ b/libc/stdlib/abort.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,93,1995-1998,2001,02,2009 Free Software Foundation, Inc. +/* Copyright (C) 1991,1993,1995-1998,2001,2002,2009,2011 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,7 +38,7 @@ #endif /* Exported variable to locate abort message in core files etc. */ -char *__abort_msg __attribute__ ((nocommon)); +struct abort_msg_s *__abort_msg __attribute__ ((nocommon)); libc_hidden_def (__abort_msg) /* We must avoid to run in circles. Therefore we remember how far we |