[Numpy-svn] r4724 - in branches/cleanconfig_rtm/numpy/core: . src

numpy-svn@scip... numpy-svn@scip...
Fri Jan 18 03:37:33 CST 2008


Author: cdavid
Date: 2008-01-18 03:37:27 -0600 (Fri, 18 Jan 2008)
New Revision: 4724

Modified:
   branches/cleanconfig_rtm/numpy/core/setup.py
   branches/cleanconfig_rtm/numpy/core/src/multiarraymodule.c
Log:
Replace NPY_NO_SIGNAL CPP symbol by __NPY_PRIVATE_NO_SIGNAL for internal code, to avoid clash between public and private config files

Modified: branches/cleanconfig_rtm/numpy/core/setup.py
===================================================================
--- branches/cleanconfig_rtm/numpy/core/setup.py	2008-01-18 06:24:13 UTC (rev 4723)
+++ branches/cleanconfig_rtm/numpy/core/setup.py	2008-01-18 09:37:27 UTC (rev 4724)
@@ -107,7 +107,7 @@
                     moredefs.append(defsymbol)
 
             if is_npy_no_signal():
-                moredefs.append('NPY_NO_SIGNAL')
+                moredefs.append('__NPY_PRIVATE_NO_SIGNAL')
 
             if sys.platform=='win32' or os.name=='nt':
                 from distutils.msvccompiler import get_build_architecture

Modified: branches/cleanconfig_rtm/numpy/core/src/multiarraymodule.c
===================================================================
--- branches/cleanconfig_rtm/numpy/core/src/multiarraymodule.c	2008-01-18 06:24:13 UTC (rev 4723)
+++ branches/cleanconfig_rtm/numpy/core/src/multiarraymodule.c	2008-01-18 09:37:27 UTC (rev 4724)
@@ -7268,7 +7268,7 @@
 }
 
 
-#ifndef NPY_NO_SIGNAL
+#ifndef __NPY_PRIVATE_NO_SIGNAL
 
 SIGJMP_BUF _NPY_SIGINT_BUF;
 



More information about the Numpy-svn mailing list