From 38b4649d74ea08b5b86fd49c6f57cf50190d97b3 Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Thu, 25 Apr 2013 17:48:14 +0200 Subject: [PATCH] fix 'restrict' usage in g++ --- Cython/Utility/ModuleSetupCode.c | 11 +++++++++++ Cython/Utility/ObjectHandling.c | 6 +----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Cython/Utility/ModuleSetupCode.c b/Cython/Utility/ModuleSetupCode.c index 5bfefdd..698a1be 100644 --- a/Cython/Utility/ModuleSetupCode.c +++ b/Cython/Utility/ModuleSetupCode.c @@ -275,6 +275,17 @@ #endif #endif +/* restrict */ +#ifndef CYTHON_RESTRICT + #if defined(__GNUC__) + #define CYTHON_RESTRICT __restrict__ + #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #define CYTHON_RESTRICT restrict + #else + #define CYTHON_RESTRICT + #endif +#endif + #ifdef NAN #define __PYX_NAN() ((float) NAN) #else diff --git a/Cython/Utility/ObjectHandling.c b/Cython/Utility/ObjectHandling.c index af33353..c9c7638 100644 --- a/Cython/Utility/ObjectHandling.c +++ b/Cython/Utility/ObjectHandling.c @@ -621,11 +621,7 @@ static CYTHON_INLINE void __Pyx_crop_slice(Py_ssize_t* _start, Py_ssize_t* _stop *_stop = stop; } -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -static CYTHON_INLINE void __Pyx_copy_object_array(PyObject** restrict src, PyObject** restrict dest, Py_ssize_t length) { -#else -static CYTHON_INLINE void __Pyx_copy_object_array(PyObject** src, PyObject** dest, Py_ssize_t length) { -#endif +static CYTHON_INLINE void __Pyx_copy_object_array(PyObject** CYTHON_RESTRICT src, PyObject** CYTHON_RESTRICT dest, Py_ssize_t length) { PyObject *v; Py_ssize_t i; for (i = 0; i < length; i++) { -- 2.7.4