aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/testsuite_performance.h4
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