Changeset 13214 for issm/trunk-jpl/src/modules/Scotch/Scotch.h

Timestamp:

08/31/12 10:47:36 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing mex module conversion to python

File:

• issm/trunk-jpl/src/modules/Scotch/Scotch.h (modified) (2 diffs)

issm/trunk-jpl/src/modules/Scotch/Scotch.h

@@ -5 +5 @@
 #ifndef _SCOTCH_H
 #define _SCOTCH_H
-
-#ifdef HAVE_CONFIG_H
-        #include <config.h>
-#else
-        #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-/*For python modules: needs to come before header files inclusion*/
-#ifdef _HAVE_PYTHON_
-#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
-#endif
 
 /* local prototypes: */
@@ -35 +24 @@
 /*  Scotch structures and prototypes  */
 #ifdef MATLAB
-                #include "mat.h"
-                #include "mex.h"
-                #include "matrix.h"
+#include "mat.h"
+#include "mex.h"
+#include "matrix.h"
 
-                #define printf mexPrintf
-                #define fprintf(file,...) (file == stdout || file == stderr ? mexPrintf(__VA_ARGS__) : fprintf(file,__VA_ARGS__))
-                #define malloc mxMalloc
-                #define calloc mxCalloc
-                #define realloc mxRealloc
-                #define free mxFree
-                #define exit(status) mexErrMsgTxt("exit=" #status)
+#define printf mexPrintf
+#define fprintf(file,...) (file == stdout || file == stderr ? mexPrintf(__VA_ARGS__) : fprintf(file,__VA_ARGS__))
+#define malloc mxMalloc
+#define calloc mxCalloc
+#define realloc mxRealloc
+#define free mxFree
+#define exit(status) mexErrMsgTxt("exit=" #status)
 #endif
 
-
 #endif  /* _SCOTCH_H */