diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2022-11-30 22:31:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-30 22:31:13 +0100 |
| commit | 01d64079b05c9b0c57775d0bb97d1cb5d52d2512 (patch) | |
| tree | 184dfcccd4af29c418a324ad44b62aae634f75d5 | |
| parent | 9896b46b36c4875badc15787c403840d997cf45a (diff) | |
| parent | 14075ff05504f2ce2275cd095e2f0172259ad775 (diff) | |
| download | numpy-01d64079b05c9b0c57775d0bb97d1cb5d52d2512.tar.gz | |
Merge pull request #22693 from mattip/backport-meson
MAINT: unify NPY_NO_SIGNAL macros
[ci skip]
| -rw-r--r-- | numpy/core/setup.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 4001f7ab0..4b61bd855 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -469,7 +469,7 @@ def configuration(parent_package='',top_path=None): # Signal check if is_npy_no_signal(): - moredefs.append('__NPY_PRIVATE_NO_SIGNAL') + moredefs.append('NPY_NO_SIGNAL') # Windows checks if sys.platform == 'win32' or os.name == 'nt': diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index 6c5eb9730..ca4fdfeca 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -4100,7 +4100,7 @@ _vec_string(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *NPY_UNUSED(kw return 0; } -#ifndef __NPY_PRIVATE_NO_SIGNAL +#ifndef NPY_NO_SIGNAL static NPY_TLS int sigint_buf_init = 0; static NPY_TLS NPY_SIGJMP_BUF _NPY_SIGINT_BUF; |