summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2021-05-05 17:05:36 -0600
committerGitHub <noreply@github.com>2021-05-05 17:05:36 -0600
commitf693864fb364c093530bd645146a83fac7cd28db (patch)
tree647a91512741aea5bcb6f7509cbfddd28d543e92
parent71ced064884f28bc9a5fbd344e4fc77b984c08f7 (diff)
parent46bc1fc554b6560142ed11ab49ad5a380699a243 (diff)
downloadnumpy-f693864fb364c093530bd645146a83fac7cd28db.tar.gz
Merge pull request #18910 from dongkeun-oh/fix_thread
BUG : for MINGW, threads.h existence test requires GLIBC > 2.12
-rw-r--r--numpy/f2py/cfuncs.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
index 974062f26..f403a66b5 100644
--- a/numpy/f2py/cfuncs.py
+++ b/numpy/f2py/cfuncs.py
@@ -545,7 +545,9 @@ cppmacros['OLDPYNUM'] = """\
"""
cppmacros["F2PY_THREAD_LOCAL_DECL"] = """\
#ifndef F2PY_THREAD_LOCAL_DECL
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) \\
+ || defined(_WIN32) || defined(_WIN64) \\
+ || defined(__MINGW32__) || defined(__MINGW64__)
#define F2PY_THREAD_LOCAL_DECL __declspec(thread)
#elif defined(__STDC_VERSION__) \\
&& (__STDC_VERSION__ >= 201112L) \\