Index: boost/python/detail/wrap_python.hpp
===================================================================
--- boost/python/detail/wrap_python.hpp	(revision 85020)
+++ boost/python/detail/wrap_python.hpp	(working copy)
@@ -127,8 +127,6 @@
 #   define _MSC_VER 900
 #  endif
 
-#  undef hypot // undo the evil #define left by Python.
-
 # elif defined(__BORLANDC__)
 #  undef HAVE_HYPOT
 #  define HAVE_HYPOT 1
@@ -136,6 +134,10 @@
 
 #endif // _WIN32
 
+#ifdef hypot
+#  undef hypot // undo the evil #define left by Python.
+#endif
+
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 2 && PY_MICRO_VERSION < 2
 # include <boost/python/detail/python22_fixed.h>
 #else