commit 80315664bc6a9a947ac3cc000eb8c9ae17fb3626
author Zachary Ware <zachary.ware@gmail.com> Thu Feb 20 15:36:34 2014 -0600
committer Zachary Ware <zachary.ware@gmail.com> Thu Feb 20 15:36:34 2014 -0600
tree 7792bd55ef8a9eb365f219b65fe21d4411f250cf
parent 47ff6fa6008a565f980079aab44b24da9982b9c2

Issue #20221: Removed conflicting (or circular) hypot definition
when compiled with VS 2010 or above.  Initial patch by Tabrez Mohammed.

PC/pyconfig.h

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index a45d5eb..a49ce69 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -217,7 +217,11 @@
 #define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
 #define Py_IS_FINITE(X) _finite(X)
 #define copysign _copysign
+
+/* VS 2010 and above already defines hypot as _hypot */
+#if _MSC_VER < 1600
 #define hypot _hypot
+#endif
 
 #endif /* _MSC_VER */