diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-02-20 15:36:34 -0600 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-02-20 15:36:34 -0600 |
| commit | 412b5d469ffdbc61e41031a4d7c2cd63c29b8abe (patch) | |
| tree | 965362e95b660a0a77382124babe149a7131e5ba /PC | |
| parent | a157be6134b7eadad74807c4dad4a3e4fdf859ae (diff) | |
| download | cpython-412b5d469ffdbc61e41031a4d7c2cd63c29b8abe.tar.gz | |
Issue #20221: Removed conflicting (or circular) hypot definition
when compiled with VS 2010 or above. Initial patch by Tabrez Mohammed.
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/pyconfig.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index f320ccf588..0b96539fdd 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -213,7 +213,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 |