From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 22 Dec 2018 01:56:58 +0000 (-0800)
Subject: bpo-11566: Extension build errors on Windows for _hypot (GH-11283)
X-Git-Tag: v3.7.3rc1~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c046d6b6187e4de98a29e67ccbfd9b1b8790ee2f;p=thirdparty%2FPython%2Fcpython.git

bpo-11566: Extension build errors on Windows for _hypot (GH-11283)


This addresses C extension build errors related to an undefined _hypot
symbol when building with the Microsoft Visual C++ Compiler for Python
2.7 [1] or MinGWPy [2]. It also addresses errors when building a C++
extension with MinGWPy and C++11 from cmath, 'error "::hypot' has not
been declared'

[1] https://www.microsoft.com/en-us/download/details.aspx?id=44266
[2] https://mingwpy.github.io/
(cherry picked from commit 87667c54c6650751c5d7bf7b9e465c8c4af45f71)

Co-authored-by: Matt McCormick <matt@mmmccormick.com>
---

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index d2a3f5dd39bb..bb9171fbcb7d 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -192,11 +192,6 @@ typedef int pid_t;
 #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
-
 /* VS 2015 defines these names with a leading underscore */
 #if _MSC_VER >= 1900
 #define timezone _timezone
@@ -231,7 +226,6 @@ typedef int pid_t;
 #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