Author: mattip <[email protected]>
Branch: ufuncapi
Changeset: r75336:e1871503d572
Date: 2015-01-14 23:59 +0200
http://bitbucket.org/pypy/pypy/changeset/e1871503d572/
Log: add more types
diff --git a/pypy/module/cpyext/include/numpy/npy_common.h
b/pypy/module/cpyext/include/numpy/npy_common.h
--- a/pypy/module/cpyext/include/numpy/npy_common.h
+++ b/pypy/module/cpyext/include/numpy/npy_common.h
@@ -3,6 +3,8 @@
typedef Py_intptr_t npy_intp;
typedef Py_uintptr_t npy_uintp;
+typedef PY_LONG_LONG npy_longlong;
+typedef unsigned PY_LONG_LONG npy_ulonglong;
typedef unsigned char npy_bool;
typedef long npy_int32;
typedef unsigned long npy_uint32;
@@ -10,6 +12,24 @@
typedef long npy_int64;
typedef unsigned long npy_uint64;
typedef unsigned char npy_uint8;
+
+typedef signed char npy_byte;
+typedef unsigned char npy_ubyte;
+typedef unsigned short npy_ushort;
+typedef unsigned int npy_uint;
+typedef unsigned long npy_ulong;
+
+/* These are for completeness */
+typedef char npy_char;
+typedef short npy_short;
+typedef int npy_int;
+typedef long npy_long;
+typedef float npy_float;
+typedef double npy_double;
+
+typedef struct { float real, imag; } npy_cfloat;
+typedef struct { double real, imag; } npy_cdouble;
+typedef npy_cdouble npy_complex128;
#if defined(_MSC_VER)
#define NPY_INLINE __inline
#elif defined(__GNUC__)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit