diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2013-08-12 17:09:01 -0700 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2013-08-12 17:09:01 -0700 |
| commit | 6cae18513cf244ad919ad1f9994446c1d126f35a (patch) | |
| tree | ed128016aaae13b3a8942116210db1fac75108a9 /numpy/core | |
| parent | 505dc05eee8362db98919b8ecd485fb5d8100e42 (diff) | |
| download | numpy-6cae18513cf244ad919ad1f9994446c1d126f35a.tar.gz | |
BLD: Fix build on MSVC (no uint64_t, use npy_uint64)
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/umath/struct_ufunc_test.c.src | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/src/umath/struct_ufunc_test.c.src b/numpy/core/src/umath/struct_ufunc_test.c.src index 4bd24559f..517925570 100644 --- a/numpy/core/src/umath/struct_ufunc_test.c.src +++ b/numpy/core/src/umath/struct_ufunc_test.c.src @@ -29,7 +29,7 @@ static void add_uint64_triplet(char **args, npy_intp *dimensions, npy_intp is2=steps[1]; npy_intp os=steps[2]; npy_intp n=dimensions[0]; - uint64_t *x, *y, *z; + npy_uint64 *x, *y, *z; char *i1=args[0]; char *i2=args[1]; @@ -37,9 +37,9 @@ static void add_uint64_triplet(char **args, npy_intp *dimensions, for (i = 0; i < n; i++) { - x = (uint64_t*)i1; - y = (uint64_t*)i2; - z = (uint64_t*)op; + x = (npy_uint64*)i1; + y = (npy_uint64*)i2; + z = (npy_uint64*)op; z[0] = x[0] + y[0]; z[1] = x[1] + y[1]; |