Author: mattip <matti.pi...@gmail.com>
Branch: cpyext-for-merge
Changeset: r83974:56b8dd0c1546
Date: 2016-04-27 00:24 +0300
http://bitbucket.org/pypy/pypy/changeset/56b8dd0c1546/
Log: tweak headers for new pypy_numpy.h
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,6 +5,7 @@
npy_bool obval;
} PyBoolScalarObject;
-#define import_array()
-#define PyArray_New _PyArray_New
+static int import_array(){};
+static int _import_array(){};
+static int _import_math(){};
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
@@ -10,6 +10,7 @@
extern "C" {
#endif
+#include "pypy_numpy.h"
#include "old_defines.h"
#include "npy_common.h"
#include "__multiarray_api.h"
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
