Changeset 12128


Ignore:
Timestamp:
04/25/12 09:59:22 (13 years ago)
Author:
Eric.Larour
Message:

Folded NPY_DEPRECATED python stuff into pythonincludes header file

Location:
issm/trunk-jpl/src/c
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r12102 r12128  
    950950libISSMPython_a_SOURCES = $(python_sources)
    951951libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS)
    952 if PYTHON3
    953 libISSMPython_a_CXXFLAGS+=  -DNPY_NO_DEPRECATED_API
    954 endif
    955952endif
    956953

  • issm/trunk-jpl/src/c/toolkits/python/pythonincludes.h

    r12017 r12128  
    66#define _PYTHON_INCLUDES_H_
    77
     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
    821
    922#include "Python.h"
Note: See TracChangeset for help on using the changeset viewer.