diff options
| author | begasus <begasus@gmail.com> | 2022-09-16 12:34:10 +0200 |
|---|---|---|
| committer | begasus <begasus@gmail.com> | 2022-09-16 12:37:16 +0200 |
| commit | 159abdfd14f2f308b31342dd8e202580926c3191 (patch) | |
| tree | 86d7eeccb7b8d8fc1bafec5d6da693f4fa067006 | |
| parent | 5f94eb858f3e181eccfda2c26db9f0b9167a8156 (diff) | |
| download | numpy-159abdfd14f2f308b31342dd8e202580926c3191.tar.gz | |
MAINT, Haiku defines neither __STDC_NO_THREADS__ nor __GLIBC__
| -rw-r--r-- | numpy/core/include/numpy/npy_os.h | 2 | ||||
| -rw-r--r-- | numpy/f2py/cfuncs.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/include/numpy/npy_os.h b/numpy/core/include/numpy/npy_os.h index 6d335f751..6d8317d06 100644 --- a/numpy/core/include/numpy/npy_os.h +++ b/numpy/core/include/numpy/npy_os.h @@ -27,6 +27,8 @@ #define NPY_OS_MINGW #elif defined(__APPLE__) #define NPY_OS_DARWIN +#elif defined(__HAIKU__) + #define NPY_OS_HAIKU #else #define NPY_OS_UNKNOWN #endif diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index 64d96c3c2..962be48d3 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -548,7 +548,7 @@ cppmacros["F2PY_THREAD_LOCAL_DECL"] = """\ && (__STDC_VERSION__ >= 201112L) \\ && !defined(__STDC_NO_THREADS__) \\ && (!defined(__GLIBC__) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 12)) \\ - && !defined(NPY_OS_OPENBSD) + && !defined(NPY_OS_OPENBSD) && !defined(NPY_OS_HAIKU) /* __STDC_NO_THREADS__ was first defined in a maintenance release of glibc 2.12, see https://lists.gnu.org/archive/html/commit-hurd/2012-07/msg00180.html, so `!defined(__STDC_NO_THREADS__)` may give false positive for the existence |