cpython: bf413a97f1a9 (original) (raw)
Mercurial > cpython
changeset 89310:bf413a97f1a9
Issue #20221: Removed conflicting (or circular) hypot definition when compiled with VS 2010 or above. Initial patch by Tabrez Mohammed. [#20221]
| Zachary Ware zachary.ware@gmail.com | |
|---|---|
| date | Thu, 20 Feb 2014 15:39:29 -0600 |
| parents | cd23d0c3f850(current diff)9aedb876c2d7(diff) |
| children | ad92e63de42c |
| files | Misc/NEWS PC/pyconfig.h |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-)[+] [-] Misc/NEWS 3 PC/pyconfig.h 4 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,6 +103,9 @@ Tests Build ----- +- Issue #20221: Removed conflicting (or circular) hypot definition when
- Issue #20609: Restored the ability to build 64-bit Windows binaries on 32-bit Windows, which was broken by the change in issue #19788.
--- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -207,7 +207,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 /* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/ #if _MSC_VER >= 1400 && _MSC_VER < 1600