From 1d6f543eb85a2632a8dcee401e8ec76776f407e3 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Sat, 5 Jan 2013 15:15:44 -0700 Subject: BUG: Replace unprefixed SIZEOF_* macros with prefixed versions. The sources don't define NPY_NO_PREFIX and consequently none of the unprefixed macros are defined. Using them can lead to some unexpected results. --- numpy/core/src/scalarmathmodule.c.src | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'numpy/core/src/scalarmathmodule.c.src') diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src index 3241f97b8..57c610b9e 100644 --- a/numpy/core/src/scalarmathmodule.c.src +++ b/numpy/core/src/scalarmathmodule.c.src @@ -24,7 +24,7 @@ * types of the same rank to have the same width. */ -#if SIZEOF_LONGLONG == 64 +#if NPY_SIZEOF_LONGLONG == 64 static int ulonglong_overflow(npy_ulonglong a, npy_ulonglong b) @@ -72,7 +72,7 @@ slonglong_overflow(npy_longlong a0, npy_longlong b0) (((x & mask) + (y & mask) + (w >> 32)) >> 31); } -#elif SIZEOF_LONGLONG == 128 +#elif NPY_SIZEOF_LONGLONG == 128 static int ulonglong_overflow(npy_ulonglong a, npy_ulonglong b) @@ -203,8 +203,8 @@ static void } /**end repeat**/ -#ifndef SIZEOF_BYTE -#define SIZEOF_BYTE 1 +#ifndef NPY_SIZEOF_BYTE +#define NPY_SIZEOF_BYTE 1 #endif /**begin repeat -- cgit v1.2.1