summaryrefslogtreecommitdiff
path: root/numpy/f2py/cfuncs.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/f2py/cfuncs.py')
-rw-r--r--numpy/f2py/cfuncs.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
index 5312b0ec5..3e0adbd8b 100644
--- a/numpy/f2py/cfuncs.py
+++ b/numpy/f2py/cfuncs.py
@@ -230,8 +230,12 @@ cppmacros['PRINTPYOBJERR']="""\
\tfprintf(stderr,\"\\n\");
"""
cppmacros['MINMAX']="""\
+#ifndef max
#define max(a,b) ((a > b) ? (a) : (b))
+#endif
+#ifndef min
#define min(a,b) ((a < b) ? (a) : (b))
+#endif
#ifndef MAX
#define MAX(a,b) ((a > b) ? (a) : (b))
#endif