Merge pull request numpy#22693 from mattip/backport-meson

MAINT: unify NPY_NO_SIGNAL macros [ci skip]
SyamGadde · Nov 30, 2022 · 01d6407 · 01d6407
2 parents 9896b46 + 14075ff
commit 01d6407
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -469,7 +469,7 @@ def generate_config_h(ext, build_dir):
 
             # 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
@@ -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;