Mac CodeWarrior has faulty declaration for hypot, which we hide with a

#define.
(Jack)

diff --git a/Include/mymath.h b/Include/mymath.h
index 9257a89df10974fb3d984c3cadb612b5952ae9d8..f4fffabf2f1fc47eae2e26237d716b13984581d7 100644 (file)
--- 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