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

libstdc++-v3/ChangeLog

+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.

libstdc++-v3/testsuite/testsuite_performance.h

 // -*- 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