traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #20221: Removed conflicting (or circular) hypot definition 

when compiled with VS 2010 or above.  Initial patch by Tabrez Mohammed.
This commit is contained in:
Zachary Ware 2014-02-20 15:39:29 -06:00
parent 37f15bcfed
commit 0c9beb64de
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -68,6 +68,9 @@ Library
Build 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 - Issue #20609: Restored the ability to build 64-bit Windows binaries on
32-bit Windows, which was broken by the change in issue #19788. 32-bit Windows, which was broken by the change in issue #19788.

4
PC/pyconfig.h
View File

@ -207,7 +207,11 @@ typedef int pid_t;
#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X)) #define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
#define Py_IS_FINITE(X) _finite(X) #define Py_IS_FINITE(X) _finite(X)
#define copysign _copysign #define copysign _copysign
/* VS 2010 and above already defines hypot as _hypot */
#if _MSC_VER < 1600
#define hypot _hypot #define hypot _hypot
#endif
/* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/ /* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/
#if _MSC_VER >= 1400 && _MSC_VER < 1600 #if _MSC_VER >= 1400 && _MSC_VER < 1600