summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--numpy/__init__.py1
-rw-r--r--numpy/core/src/arraymethods.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py
index 17202cd95..96edd88c2 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -32,7 +32,6 @@ else:
from _import_tools import PackageLoader
pkgload = PackageLoader()
pkgload('testing','core','lib','linalg','dft','random','f2py',
- 'distutils',
verbose=NUMPY_IMPORT_VERBOSE,postpone=False)
if __doc__ is not None:
diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c
index c48904f25..9d5dc2e75 100644
--- a/numpy/core/src/arraymethods.c
+++ b/numpy/core/src/arraymethods.c
@@ -971,7 +971,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
{
PyObject *shape;
PyArray_Descr *typecode;
- long fortran;
+ int fortran;
PyObject *rawdata;
char *datastr;
int len;