diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-12-05 23:28:22 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-12-05 23:28:22 +0000 |
| commit | ae23f7575ce99a08d5c86fa1ba33a90dd49f1513 (patch) | |
| tree | 5da875676bf376df4d2492a87bc9a73dcaa4068c | |
| parent | 618a86bf2bea4a44ae4146dfb3516af3b9808070 (diff) | |
| download | gcc-ae23f7575ce99a08d5c86fa1ba33a90dd49f1513.zip gcc-ae23f7575ce99a08d5c86fa1ba33a90dd49f1513.tar.gz gcc-ae23f7575ce99a08d5c86fa1ba33a90dd49f1513.tar.bz2 | |
re PR libstdc++/18837 (testsuite_performance.h:63: error: redefinition of 'struct mallinfo')
2004-12-05 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/18837
* testsuite/testsuite_performance.h: Fix mallinfo macros for
hpux.
From-SVN: r91757
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/testsuite_performance.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 386fae6..744c02c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2004-12-05 Paolo Carlini <pcarlini@suse.de> + + PR libstdc++/18837 + * testsuite/testsuite_performance.h: Fix mallinfo macros for + hpux. + 2004-12-04 Richard Henderson <rth@redhat.com> * testsuite/26_numerics/complex/pow.cc: Use -mieee on alpha. diff --git a/libstdc++-v3/testsuite/testsuite_performance.h b/libstdc++-v3/testsuite/testsuite_performance.h index a0d0c29..d76c252 100644 --- a/libstdc++-v3/testsuite/testsuite_performance.h +++ b/libstdc++-v3/testsuite/testsuite_performance.h @@ -1,7 +1,7 @@ // -*- C++ -*- // Testing performance utilities for the C++ library testsuite. // -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -56,7 +56,7 @@ extern "C" return m; } } -#else +#elif !defined (__hpux__) extern "C" { struct mallinfo |