diff options
| author | Travis E. Oliphant <teoliphant@gmail.com> | 2012-07-17 19:22:28 -0700 |
|---|---|---|
| committer | Travis E. Oliphant <teoliphant@gmail.com> | 2012-07-17 19:22:28 -0700 |
| commit | c83e5b691513f235c7f1deb398943bf9cd4b35bb (patch) | |
| tree | 252c2f2da034206649e9ad832ad60fdb32724c4d /numpy | |
| parent | bf2c101136d7a28eb04794f24ffaaa251f4ca603 (diff) | |
| parent | b8a2ea7d5416775e71266167bad3e02b292316dc (diff) | |
| download | numpy-c83e5b691513f235c7f1deb398943bf9cd4b35bb.tar.gz | |
Merge pull request #327 from teoliphant/restore_api
Restore ability to not include semi-colons.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/ndarraytypes.h | 16 | ||||
| -rw-r--r-- | numpy/core/include/numpy/ufuncobject.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h index 13483396b..954303352 100644 --- a/numpy/core/include/numpy/ndarraytypes.h +++ b/numpy/core/include/numpy/ndarraytypes.h @@ -911,21 +911,21 @@ typedef int (PyArray_FinalizeFunc)(PyArrayObject *, PyObject *); #if NPY_ALLOW_THREADS #define NPY_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS #define NPY_END_ALLOW_THREADS Py_END_ALLOW_THREADS -#define NPY_BEGIN_THREADS_DEF PyThreadState *_save=NULL -#define NPY_BEGIN_THREADS do {_save = PyEval_SaveThread();} while (0) -#define NPY_END_THREADS do {if (_save) PyEval_RestoreThread(_save);} while (0) +#define NPY_BEGIN_THREADS_DEF PyThreadState *_save=NULL; +#define NPY_BEGIN_THREADS do {_save = PyEval_SaveThread();} while (0); +#define NPY_END_THREADS do {if (_save) PyEval_RestoreThread(_save);} while (0); #define NPY_BEGIN_THREADS_DESCR(dtype) \ do {if (!(PyDataType_FLAGCHK(dtype, NPY_NEEDS_PYAPI))) \ - NPY_BEGIN_THREADS;} while (0) + NPY_BEGIN_THREADS;} while (0); #define NPY_END_THREADS_DESCR(dtype) \ do {if (!(PyDataType_FLAGCHK(dtype, NPY_NEEDS_PYAPI))) \ - NPY_END_THREADS; } while (0) + NPY_END_THREADS; } while (0); -#define NPY_ALLOW_C_API_DEF PyGILState_STATE __save__ -#define NPY_ALLOW_C_API do {__save__ = PyGILState_Ensure();} while (0) -#define NPY_DISABLE_C_API do {PyGILState_Release(__save__);} while (0) +#define NPY_ALLOW_C_API_DEF PyGILState_STATE __save__; +#define NPY_ALLOW_C_API do {__save__ = PyGILState_Ensure();} while (0); +#define NPY_DISABLE_C_API do {PyGILState_Release(__save__);} while (0); #else #define NPY_BEGIN_ALLOW_THREADS #define NPY_END_ALLOW_THREADS diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h index 7f717a2c1..076dd880c 100644 --- a/numpy/core/include/numpy/ufuncobject.h +++ b/numpy/core/include/numpy/ufuncobject.h @@ -257,8 +257,8 @@ typedef struct _tagPyUFuncObject { (UFUNC_ERR_WARN << UFUNC_SHIFT_INVALID) #if NPY_ALLOW_THREADS -#define NPY_LOOP_BEGIN_THREADS do {if (!(loop->obj & UFUNC_OBJ_NEEDS_API)) _save = PyEval_SaveThread();} while (0) -#define NPY_LOOP_END_THREADS do {if (!(loop->obj & UFUNC_OBJ_NEEDS_API)) PyEval_RestoreThread(_save);} while (0) +#define NPY_LOOP_BEGIN_THREADS do {if (!(loop->obj & UFUNC_OBJ_NEEDS_API)) _save = PyEval_SaveThread();} while (0); +#define NPY_LOOP_END_THREADS do {if (!(loop->obj & UFUNC_OBJ_NEEDS_API)) PyEval_RestoreThread(_save);} while (0); #else #define NPY_LOOP_BEGIN_THREADS #define NPY_LOOP_END_THREADS |