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

  • TabularUnified proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/toolkits/python/pythonincludes.h

     
    66#define _PYTHON_INCLUDES_H_
    77
    88
     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
    922#include "Python.h"
    1023#include "arrayobject.h"
    1124

  • TabularUnified proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am

     
    949949if PYTHON
    950950libISSMPython_a_SOURCES = $(python_sources)
    951951libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS)
    952 if PYTHON3
    953 libISSMPython_a_CXXFLAGS+=  -DNPY_NO_DEPRECATED_API
    954952endif
    955 endif
    956953
    957954if MATLAB
    958955libISSMMatlab_a_SOURCES = $(matlab_sources)
Note: See TracBrowser for help on using the repository browser.