(original) (raw)

changeset: 89755:033d686af4c1 branch: 3.4 user: Zachary Ware zachary.ware@gmail.com date: Thu Feb 20 15:39:29 2014 -0600 files: Misc/NEWS PC/pyconfig.h description: Issue #20221: Removed conflicting (or circular) hypot definition when compiled with VS 2010 or above. Initial patch by Tabrez Mohammed. diff -r 0f26daac85bb -r 033d686af4c1 Misc/NEWS --- a/Misc/NEWS Thu Feb 20 16:20:44 2014 -0500 +++ b/Misc/NEWS Thu Feb 20 15:39:29 2014 -0600 @@ -68,6 +68,9 @@ Build ----- +- Issue #20221: Removed conflicting (or circular) hypot definition when + compiled with VS 2010 or above. Initial patch by Tabrez Mohammed. + - Issue #20609: Restored the ability to build 64-bit Windows binaries on 32-bit Windows, which was broken by the change in issue #19788. diff -r 0f26daac85bb -r 033d686af4c1 PC/pyconfig.h --- a/PC/pyconfig.h Thu Feb 20 16:20:44 2014 -0500 +++ b/PC/pyconfig.h Thu Feb 20 15:39:29 2014 -0600 @@ -207,7 +207,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 /* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/ #if _MSC_VER >= 1400 && _MSC_VER < 1600 /zachary.ware@gmail.com