source: issm/oecreview/Archive/12121-12140/ISSM-12127-12128.diff@ 12325

Last change on this file since 12325 was 12325, checked in by Eric.Larour, 13 years ago

11990 to 12321 oec compliance
File size: 1.3 KB
RevLine 
[12325]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/toolkits/python/pythonincludes.h
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/toolkits/python/pythonincludes.h (revision 12127)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/toolkits/python/pythonincludes.h (revision 12128)
5@@ -6,6 +6,19 @@
6 #define _PYTHON_INCLUDES_H_
7
8
9+#ifdef HAVE_CONFIG_H
10+ #include <config.h>
11+#else
12+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
13+#endif
14+
15+#if _PYTHON_MAJOR_ == 2
16+#undef NPY_NO_DEPRECATED_API
17+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
18+#else
19+#define NPY_NO_DEPRECATED_API
20+#endif
21+
22 #include "Python.h"
23 #include "arrayobject.h"
24
25Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am
26===================================================================
27--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 12127)
28+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 12128)
29@@ -949,10 +949,7 @@
30 if PYTHON
31 libISSMPython_a_SOURCES = $(python_sources)
32 libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS)
33-if PYTHON3
34-libISSMPython_a_CXXFLAGS+= -DNPY_NO_DEPRECATED_API
35 endif
36-endif
37
38 if MATLAB
39 libISSMMatlab_a_SOURCES = $(matlab_sources)
Note: See TracBrowser for help on using the repository browser.