Author: Matti Picus <[email protected]>
Branch: cpyext-for-merge
Changeset: r83975:dcf60419c6be
Date: 2016-04-27 15:31 +0300
http://bitbucket.org/pypy/pypy/changeset/dcf60419c6be/
Log: tweak includes to reduce warnings
diff --git a/pypy/module/cpyext/include/numpy/__multiarray_api.h
b/pypy/module/cpyext/include/numpy/__multiarray_api.h
--- a/pypy/module/cpyext/include/numpy/__multiarray_api.h
+++ b/pypy/module/cpyext/include/numpy/__multiarray_api.h
@@ -5,7 +5,7 @@
npy_bool obval;
} PyBoolScalarObject;
-static int import_array(){};
-static int _import_array(){};
-static int _import_math(){};
+static int import_array(){return 0;};
+static int _import_array(){return 0;};
+static int _import_math(){return 0;};
diff --git a/pypy/module/cpyext/include/numpy/arrayobject.h
b/pypy/module/cpyext/include/numpy/arrayobject.h
--- a/pypy/module/cpyext/include/numpy/arrayobject.h
+++ b/pypy/module/cpyext/include/numpy/arrayobject.h
@@ -201,7 +201,6 @@
#define PyArray_FILLWBYTE _PyArray_FILLWBYTE
#define PyArray_ZEROS _PyArray_ZEROS
-#define PyArray_CopyInto _PyArray_CopyInto
#define PyArray_Resize(self, newshape, refcheck, fortran) (NULL)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
