Merge bk-internal:/home/bk/mysql-5.0-maint

into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
88ad41e2 · msvensson@pilot.blaudden · 49b18703 · ffd0d33f · 88ad41e2
Commit 88ad41e2 authored Apr 24, 2007 by msvensson@pilot.blaudden
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

include/my_global.h include/my_global.h +6 -1

No files found.
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -820,7 +820,12 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define SSIZE_MAX ((~((size_t) 0)) / 2)
 #endif
-#if !defined(HAVE_ISINF) && !defined(isinf)
+#if !defined(HAVE_ISINF)
+/* The configure check for "isinf with math.h" has failed */
+#ifdef isinf
+#undef isinf
+#endif
+/* Define isinf to never say that X is infinite */
 #define isinf(X)    0
 #endif