summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorPaul Monson <paulmon@users.noreply.github.com>2019-04-18 01:09:16 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2019-04-18 01:09:16 (GMT)
commit11efd79076559cc6e4034bb36db73e5e4293f02d (patch)
tree13fb73b3d06b903cf857431d2622846131e829c0 /Include
parent264a0b40b030fc0ff919b8294df91bdaac853bfb (diff)
downloadcpython-11efd79076559cc6e4034bb36db73e5e4293f02d.zip
cpython-11efd79076559cc6e4034bb36db73e5e4293f02d.tar.gz
cpython-11efd79076559cc6e4034bb36db73e5e4293f02d.tar.bz2
bpo-36071 Add support for Windows ARM32 in ctypes/libffi (GH-12059)
Diffstat (limited to 'Include')
-rw-r--r--Include/pyport.h2
-rw-r--r--Include/pythonrun.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 075b360..acbae5b 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -427,7 +427,7 @@ extern "C" {
#endif
/* get and set x87 control word for VisualStudio/x86 */
-#if defined(_MSC_VER) && defined(_M_IX86) /* x87 only supported in x86 */
+#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_M_ARM) /* x87 not supported in 64-bit or ARM */
#define HAVE_PY_SET_53BIT_PRECISION 1
#define _Py_SET_53BIT_PRECISION_HEADER \
unsigned int old_387controlword, new_387controlword, out_387controlword
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 6f0c6fc..e83846a 100644
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -165,7 +165,7 @@ PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
to an 8k margin. */
#define PYOS_STACK_MARGIN 2048
-#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300
+#if defined(WIN32) && !defined(MS_WIN64) && !defined(_M_ARM) && defined(_MSC_VER) && _MSC_VER >= 1300
/* Enable stack checking under Microsoft C */
#define USE_STACKCHECK
#endif