[pypy-commit] pypy default: There are three includes of npy_common.h from three files in the same

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90343:3a53ec66f961
Date: 2017-02-25 07:27 +0100
http://bitbucket.org/pypy/pypy/changeset/3a53ec66f961/

Log:	There are three includes of npy_common.h from three files in the
	same directory. They use three different styles, at least one of
	which is wrong according to issue #2483. Fix.

diff --git a/pypy/module/cpyext/include/_numpypy/numpy/ndarraytypes.h b/pypy/module/cpyext/include/_numpypy/numpy/ndarraytypes.h
--- a/pypy/module/cpyext/include/_numpypy/numpy/ndarraytypes.h
+++ b/pypy/module/cpyext/include/_numpypy/numpy/ndarraytypes.h
@@ -1,7 +1,7 @@
 #ifndef NDARRAYTYPES_H
 #define NDARRAYTYPES_H
 
-#include "numpy/npy_common.h"
+#include "npy_common.h"
 //#include "npy_endian.h"
 //#include "npy_cpu.h"
 //#include "utils.h"
diff --git a/pypy/module/cpyext/include/_numpypy/numpy/npy_3kcompat.h b/pypy/module/cpyext/include/_numpypy/numpy/npy_3kcompat.h
--- a/pypy/module/cpyext/include/_numpypy/numpy/npy_3kcompat.h
+++ b/pypy/module/cpyext/include/_numpypy/numpy/npy_3kcompat.h
@@ -10,7 +10,7 @@
 #ifndef _NPY_3KCOMPAT_H_
 #define _NPY_3KCOMPAT_H_
 
-#include <numpy/npy_common.h>
+#include "npy_common.h"
 
 #define npy_PyFile_Dup(file, mode) (NULL)
 #define npy_PyFile_DupClose(file, handle) (0)