diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-08-23 15:28:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-08-23 15:28:48 +0000 |
| commit | 60907d3b8554695b78e5517df14e70064290f28c (patch) | |
| tree | 32fdc25c1de39684eb597ab659264fc4cccbdad6 | |
| parent | 75f7c634c337f1912a3f24d646b7f6ece46b2ad6 (diff) | |
pull from upstream
| -rw-r--r-- | libpthread/linuxthreads_db/CVS/Entries | 6 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/ChangeLog | 8 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/td_init.c | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/libpthread/linuxthreads_db/CVS/Entries b/libpthread/linuxthreads_db/CVS/Entries index 99a94cb65..863ce9e31 100644 --- a/libpthread/linuxthreads_db/CVS/Entries +++ b/libpthread/linuxthreads_db/CVS/Entries @@ -2,11 +2,9 @@ /td_symbol_list.c/1.5/Thu Dec 18 02:22:04 2003// /td_ta_new.c/1.13/Thu Jan 30 08:20:09 2003// /Banner/1.1/Tue Nov 15 14:20:48 2005// -/ChangeLog/1.69/Tue Nov 15 14:20:48 2005// /Versions/1.4/Tue Nov 15 14:20:48 2005// /proc_service.h/1.9/Tue Nov 15 14:20:48 2005// /shlib-versions/1.1/Tue Nov 15 14:20:48 2005// -/td_init.c/1.4/Tue Nov 15 14:20:48 2005// /td_log.c/1.3/Tue Nov 15 14:20:48 2005// /td_ta_clear_event.c/1.5/Tue Nov 15 14:20:48 2005// /td_ta_delete.c/1.4/Tue Nov 15 14:20:48 2005// @@ -44,6 +42,8 @@ /td_thr_tlsbase.c/1.4/Tue Nov 15 14:20:48 2005// /td_thr_tsd.c/1.6/Tue Nov 15 14:20:48 2005// /thread_db.h/1.14/Tue Nov 15 14:20:48 2005// -/thread_dbP.h/1.14/Tue Nov 15 14:20:48 2005// /td_thr_validate.c/1.8/Tue Nov 22 18:25:09 2005// +/ChangeLog/1.71/Wed Aug 23 15:29:15 2006// +/thread_dbP.h/1.15/Result of merge// +/td_init.c/1.5/Wed Aug 23 15:29:44 2006// D diff --git a/libpthread/linuxthreads_db/ChangeLog b/libpthread/linuxthreads_db/ChangeLog index e39097a58..9964b4dd4 100644 --- a/libpthread/linuxthreads_db/ChangeLog +++ b/libpthread/linuxthreads_db/ChangeLog @@ -1,3 +1,11 @@ +2006-04-25 Bernhard Fischer <rep.nop@aon.at> + + * td_init.c (__td_debug): Only declare when NDEBUG is undefined. + +2006-04-25 Bernhard Fischer <rep.nop@aon.at> + + * thread_dbP.h: Fix Indices typo in comment. + 2005-11-02 Daniel Jacobowitz <dan@codesourcery.com> * td_ta_clear_event.c (td_ta_clear_event): Correct arguments to diff --git a/libpthread/linuxthreads_db/td_init.c b/libpthread/linuxthreads_db/td_init.c index 6f0e1584c..66e9849bb 100644 --- a/libpthread/linuxthreads_db/td_init.c +++ b/libpthread/linuxthreads_db/td_init.c @@ -1,5 +1,5 @@ /* Initialization function of thread debugger support library. - Copyright (C) 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -24,6 +24,7 @@ int __td_debug; #endif + td_err_e td_init (void) { |