Snap for 6186523 from 1cb208a4eebe3b71ce382d7f4400f84cc09745de to studio-4.1-release
Change-Id: I33b7d46b113d80c7a86959fc216b71557194c8c3
diff --git a/x64/Include/pyconfig.h b/x64/Include/pyconfig.h
index a49ce69..5975af6 100755
--- a/x64/Include/pyconfig.h
+++ b/x64/Include/pyconfig.h
@@ -218,11 +218,6 @@
#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
-
#endif /* _MSC_VER */
/* define some ANSI types that are not defined in earlier Win headers */
@@ -274,7 +269,6 @@
#endif
#define COMPILER "[gcc]"
-#define hypot _hypot
#define PY_LONG_LONG long long
#define PY_LLONG_MIN LLONG_MIN
#define PY_LLONG_MAX LLONG_MAX
diff --git a/x86/Include/pyconfig.h b/x86/Include/pyconfig.h
index a49ce69..5975af6 100755
--- a/x86/Include/pyconfig.h
+++ b/x86/Include/pyconfig.h
@@ -218,11 +218,6 @@
#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
-
#endif /* _MSC_VER */
/* define some ANSI types that are not defined in earlier Win headers */
@@ -274,7 +269,6 @@
#endif
#define COMPILER "[gcc]"
-#define hypot _hypot
#define PY_LONG_LONG long long
#define PY_LLONG_MIN LLONG_MIN
#define PY_LLONG_MAX LLONG_MAX
