From: Paolo Carlini <pcarlini@suse.de>
Date: Mon, 4 Dec 2006 21:11:52 +0000 (+0000)
Subject: PR libstdc++/29989 (again)
X-Git-Tag: releases/gcc-4.3.0~8139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe264e58e1b00a5ee3cb2bffd8feb8e2b8300fc2;p=thirdparty%2Fgcc.git

PR libstdc++/29989 (again)

2006-12-04  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/29989 (again)
	* include/bits/c++config: #undef min and max.
	* testsuite/18_support/numeric_limits/29989.cc: New.

From-SVN: r119510
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4c98bca7aeae..b3c062f9376b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-04  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/29989 (again)
+	* include/bits/c++config: #undef min and max.
+	* testsuite/18_support/numeric_limits/29989.cc: New.
+
 2006-12-04  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* configure: Regenerate.
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index e8f6d0045b32..c4ff04083882 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -193,4 +193,8 @@ _GLIBCXX_END_NAMESPACE
 // for something else under certain OSes (see BADNAMES).
 #define __N(msgid)     (msgid)
 
+// For example, <windows.h> is known to #define min and max as macros...
+#undef min
+#undef max
+
 // End of prewritten config; the discovered settings follow.
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/29989.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/29989.cc
new file mode 100644
index 000000000000..2c82fd34bb76
--- /dev/null
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/29989.cc
@@ -0,0 +1,23 @@
+// { dg-do compile }
+
+// Copyright (C) 2006 Free Software Foundation
+//
+// 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// libstdc++/29989
+#define max(a,b) quirk
+#include <limits>