From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 20 Feb 2014 21:36:34 +0000 (-0600)
Subject: Issue #20221: Removed conflicting (or circular) hypot definition
X-Git-Tag: v2.7.9rc1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80315664bc6a9a947ac3cc000eb8c9ae17fb3626;p=python

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

diff --git a/Misc/NEWS b/Misc/NEWS
index bfaffae59f..02f898ba5c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -263,6 +263,9 @@ Tests
 Build
 -----
 
+- Issue #20221: Removed conflicting (or circular) hypot definition when
+  compiled with VS 2010 or above.  Initial patch by Tabrez Mohammed.
+
 - Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
   Jonathan Hosmer.
 
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index a45d5ebf4a..a49ce69013 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -217,7 +217,11 @@ typedef int pid_t;
 #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 */