summaryrefslogtreecommitdiffstats
path: root/PC/pyconfig.h
diff options
context:
space:
mode:
Diffstat (limited to 'PC/pyconfig.h')
-rw-r--r--PC/pyconfig.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index f320ccf..0b96539 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