diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-06-20 01:03:25 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-06-20 01:03:25 +0000 |
| commit | f1e6e2b2fa0ef6bfa9f6f4ee832cfbc1fd817728 (patch) | |
| tree | 76048db17484354f758f8f5e41dff3b44712dcd0 /numpy/core/src | |
| parent | c6c3f19d4968ca1971830fddfe391a942ec29edb (diff) | |
| download | numpy-f1e6e2b2fa0ef6bfa9f6f4ee832cfbc1fd817728.tar.gz | |
Make import_array and import_ufunc MACROS again.
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/_sortmodule.c.src | 2 | ||||
| -rw-r--r-- | numpy/core/src/scalarmathmodule.c.src | 4 | ||||
| -rw-r--r-- | numpy/core/src/umathmodule.c.src | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/src/_sortmodule.c.src b/numpy/core/src/_sortmodule.c.src index e152fe29f..a87a6858f 100644 --- a/numpy/core/src/_sortmodule.c.src +++ b/numpy/core/src/_sortmodule.c.src @@ -464,6 +464,6 @@ init_sort(void) { m = Py_InitModule("_sort", methods); - if (import_array() < 0) return; + import_array(); add_sortfuncs(); } diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src index aef6ad8d4..1ef548169 100644 --- a/numpy/core/src/scalarmathmodule.c.src +++ b/numpy/core/src/scalarmathmodule.c.src @@ -1095,8 +1095,8 @@ PyMODINIT_FUNC initscalarmath(void) { m = Py_InitModule("scalarmath", methods); - if (import_array() < 0) return; - if (import_umath() < 0) return; + import_array(); return; + import_umath(); return; if (get_functions() < 0) return; diff --git a/numpy/core/src/umathmodule.c.src b/numpy/core/src/umathmodule.c.src index 8975e68b6..8d1cd1b87 100644 --- a/numpy/core/src/umathmodule.c.src +++ b/numpy/core/src/umathmodule.c.src @@ -2045,7 +2045,7 @@ PyMODINIT_FUNC initumath(void) { m = Py_InitModule("umath", methods); /* Import the array */ - if (import_array() < 0) { + if (_import_array() < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_ImportError, "umath failed: Could not import array core."); |