diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-01-05 14:50:46 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-01-05 14:50:46 -0700 |
commit | 229979b47c6d1be0fb6892dff429738d8481c208 (patch) | |
tree | bfb1c43b17e4fd59dc5c77cd4b262ecb77917a00 /numpy | |
parent | cba2994f919a29afc446c213d44ca57ca8a925af (diff) | |
download | numpy-229979b47c6d1be0fb6892dff429738d8481c208.tar.gz |
MAINT: Add some macros to noprefix.h
Some of these are probably new unprefixed macros, but adding them
makes for a bit more safety. The unprefixed macros will be deprecated
at some point, so this probably has no side effects.
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/include/numpy/noprefix.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/numpy/core/include/numpy/noprefix.h b/numpy/core/include/numpy/noprefix.h index b3e57480e..9254c4d38 100644 --- a/numpy/core/include/numpy/noprefix.h +++ b/numpy/core/include/numpy/noprefix.h @@ -64,10 +64,28 @@ #define datetime npy_datetime #define timedelta npy_timedelta -#define SIZEOF_INTP NPY_SIZEOF_INTP -#define SIZEOF_UINTP NPY_SIZEOF_UINTP -#define SIZEOF_DATETIME NPY_SIZEOF_DATETIME -#define SIZEOF_TIMEDELTA NPY_SIZEOF_TIMEDELTA +/* + * This list of NPY_SIZEOF_* macros may define some unprefixed macros that + * were not previously defined. They are included here just in case, and as + * these will be deprecated at some point that should not cause problems. + */ +#define SIZEOF_CHAR NPY_SIZEOF_CHAR +#define SIZEOF_BYTE NPY_SIZEOF_BYTE +#define SIZEOF_SHORT NPY_SIZEOF_SHORT +#define SIZEOF_INT NPY_SIZEOF_INT +#define SIZEOF_LONG NPY_SIZEOF_LONG +#define SIZEOF_LONGLONG NPY_SIZEOF_LONGLONG +#define SIZEOF_INTP NPY_SIZEOF_INTP +#define SIZEOF_UINTP NPY_SIZEOF_UINTP +#define SIZEOF_HALF NPY_SIZEOF_HALF +#define SIZEOF_FLOAT NPY_SIZEOF_FLOAT +#define SIZEOF_DOUBLE NPY_SIZEOF_DOUBLE +#define SIZEOF_LONGDOUBLE NPY_SIZEOF_LONGDOUBLE +#define SIZEOF_CFLOAT NPY_SIZEOF_CFLOAT +#define SIZEOF_CDOUBLE NPY_SIZEOF_CDOUBLE +#define SIZEOF_CLONGDOUBLE NPY_SIZEOF_CLONGDOUBLE +#define SIZEOF_DATETIME NPY_SIZEOF_DATETIME +#define SIZEOF_TIMEDELTA NPY_SIZEOF_TIMEDELTA #define LONGLONG_FMT NPY_LONGLONG_FMT #define ULONGLONG_FMT NPY_ULONGLONG_FMT @@ -113,9 +131,6 @@ #define MIN_TIMEDELTA NPY_MIN_TIMEDELTA #define MAX_TIMEDELTA NPY_MAX_TIMEDELTA -#define SIZEOF_LONGDOUBLE NPY_SIZEOF_LONGDOUBLE -#define SIZEOF_LONGLONG NPY_SIZEOF_LONGLONG -#define SIZEOF_HALF NPY_SIZEOF_HALF #define BITSOF_BOOL NPY_BITSOF_BOOL #define BITSOF_CHAR NPY_BITSOF_CHAR #define BITSOF_SHORT NPY_BITSOF_SHORT |