summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-04-28 16:02:29 (GMT)
committerGuido van Rossum <guido@python.org>1998-04-28 16:02:29 (GMT)
commit50cc04ee032f80133bef406eb564c6371a2f1d06 (patch)
tree933a47bb1572841fcb47b84565abfd2b94aeb4b0
parent53117ae82aaa7c274ff0d26e7466e6d5ee4e8fb5 (diff)
downloadcpython-50cc04ee032f80133bef406eb564c6371a2f1d06.zip
cpython-50cc04ee032f80133bef406eb564c6371a2f1d06.tar.gz
cpython-50cc04ee032f80133bef406eb564c6371a2f1d06.tar.bz2
Mac CodeWarrior has faulty declaration for hypot, which we hide with a
#define. (Jack)
-rw-r--r--Include/mymath.h18
1 files changed, 13 insertions, 5 deletions
diff --git a/Include/mymath.h b/Include/mymath.h
index 9257a89..f4fffab 100644
--- a/Include/mymath.h
+++ b/Include/mymath.h
@@ -9,16 +9,24 @@
#pragma lib_export off
#endif
-#include <math.h>
-
-#ifdef SYMANTEC__CFM68K__
-#pragma lib_export on
+#ifndef HAVE_HYPOT
+extern double hypot Py_PROTO((double, double));
+#ifdef __MWERKS__
+#define hypot we_dont_want_faulty_hypot_decl
+#endif
#endif
+#include <math.h>
+
#ifndef HAVE_HYPOT
-extern double hypot Py_PROTO((double, double));
+#ifdef __MWERKS__
+#undef hypot
+#endif
#endif
+#ifdef SYMANTEC__CFM68K__
+#pragma lib_export on
+#endif
#if defined(USE_MSL) && defined(__MC68K__)
/* CodeWarrior MSL 2.1.1 has weird define overrides that don't work