From e205c2747503ff3b2d849885e7a402c8809dc326 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 14 Dec 2011 19:42:23 +0000 Subject: [PATCH] Simplified numpy/numarray include to avoid confusing SCons --- Cantera/python/src/pycantera.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Cantera/python/src/pycantera.cpp b/Cantera/python/src/pycantera.cpp index 34cb561cf..a77200d10 100644 --- a/Cantera/python/src/pycantera.cpp +++ b/Cantera/python/src/pycantera.cpp @@ -17,20 +17,14 @@ #ifdef HAS_NUMERIC #include "Numeric/arrayobject.h" -#else +#endif + #ifdef HAS_NUMARRAY #include "numarray/arrayobject.h" -#else +#endif + #ifdef HAS_NUMPY #include "numpy/arrayobject.h" -#else -// Create a compilation error to cause the program to bomb -#include "Numeric/arrayobject.h" -#include "numarray/arrayobject.h" -#include "numpy/libnumarray.h" -#include "numpy/arrayobject.h" -#endif -#endif #endif #include "clib/ct.h"