merge

Cython/Compiler/Nodes.py

@@ -5002,10 +5002,10 @@ bad:
 
 restore_exception_utility_code = [
 """
-static void INLINE __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static void INLINE __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 ""","""
-static void INLINE __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
+static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
     PyObject *tmp_type, *tmp_value, *tmp_tb;
     PyThreadState *tstate = PyThreadState_GET();
 
@@ -5020,7 +5020,7 @@ static void INLINE __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *t
     Py_XDECREF(tmp_tb);
 }
 
-static void INLINE __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
+static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
     PyThreadState *tstate = PyThreadState_GET();
     *type = tstate->curexc_type;
     *value = tstate->curexc_value;
@@ -5160,10 +5160,10 @@ bad:
 
 reset_exception_utility_code = [
 """
-static void INLINE __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
 ""","""
-static void INLINE __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
+static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
     PyThreadState *tstate = PyThreadState_GET();
     *type = tstate->exc_type;
     *value = tstate->exc_value;

Cython/Includes/numpy.pxd

@@ -176,9 +176,9 @@ cdef extern from "numpy/arrayobject.h":
     cdef int PyArray_TYPE(ndarray arr)
     cdef int PyArray_NDIM(ndarray arr)
     cdef int PyArray_ISWRITEABLE(ndarray arr)
-    cdef npy_intp PyArray_STRIDES(ndarray arr)
-    cdef npy_intp PyArray_DIMS(ndarray arr)
-    cdef Py_ssize_t PyArray_ITEMSIZE(ndarray arr)
+    cdef npy_intp* PyArray_STRIDES(ndarray arr)
+    cdef npy_intp* PyArray_DIMS(ndarray arr)
+    cdef int PyArray_ITEMSIZE(ndarray arr)
     cdef int PyArray_CHKFLAGS(ndarray arr, int flags)
     cdef int PyArray_HASFIELDS(ndarray arr, int flags)