source: issm/oecreview/Archive/13393-13976/ISSM-13749-13750.diff@ 15393

Last change on this file since 15393 was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'

File size: 1.3 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/wrappers/python/include/pythonincludes.h
2===================================================================
3--- ../trunk-jpl/src/wrappers/python/include/pythonincludes.h (revision 0)
4+++ ../trunk-jpl/src/wrappers/python/include/pythonincludes.h (revision 13750)
5@@ -0,0 +1,24 @@
6+
7+#ifndef _PYTHON_INCLUDES_H_
8+#define _PYTHON_INCLUDES_H_
9+
10+#ifdef HAVE_CONFIG_H
11+#include <config.h>
12+#else
13+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
14+#endif
15+
16+#ifdef _HAVE_PYTHON_
17+
18+#if _PYTHON_MAJOR_ == 2
19+#undef NPY_NO_DEPRECATED_API
20+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
21+#else
22+#define NPY_NO_DEPRECATED_API
23+#endif
24+
25+#include <Python.h>
26+#include <arrayobject.h>
27+
28+#endif
29+#endif /*_PYTHON_INCLUDES_H_*/
30Index: ../trunk-jpl/src/wrappers/matlab/include/matlabincludes.h
31===================================================================
32--- ../trunk-jpl/src/wrappers/matlab/include/matlabincludes.h (revision 0)
33+++ ../trunk-jpl/src/wrappers/matlab/include/matlabincludes.h (revision 13750)
34@@ -0,0 +1,15 @@
35+
36+#ifndef _MATLAB_INCLUDES_H_
37+#define _MATLAB_INCLUDES_H_
38+
39+#ifdef HAVE_CONFIG_H
40+#include <config.h>
41+#else
42+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
43+#endif
44+
45+#ifdef _HAVE_MATLAB_
46+#include <mex.h>
47+#endif
48+
49+#endif /*_MATLAB_INCLUDES_H_*/
Note: See TracBrowser for help on using the repository browser.