summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorunknown <kaa@polly.local>2007-04-30 13:33:13 +0400
committerunknown <kaa@polly.local>2007-04-30 13:33:13 +0400
commit748a0832fd3cbda4b65f111e33d7faff9f01d0a9 (patch)
tree2deabdbfadb07a0e0af757f5a60c3f3f151f3ccd /include/my_global.h
parent1f476af974d6762ef8df48888a6e8371fb8672cc (diff)
parentb42eb01e5859a8554b91b8a7a3c42cbdf3917f9c (diff)
downloadmariadb-git-748a0832fd3cbda4b65f111e33d7faff9f01d0a9.tar.gz
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
into polly.local:/home/kaa/src/maint/mysql-5.1-maint include/my_global.h: Auto merged
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h
index c5aa0a15728..71a2d087a43 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -847,13 +847,20 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define SSIZE_MAX ((~((size_t) 0)) / 2)
#endif
+#ifndef HAVE_FINITE
+#define finite(x) (1.0 / fabs(x) > 0.0)
+#endif
+
+#ifndef HAVE_ISNAN
+#define isnan(x) ((x) != (x))
+#endif
+
#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
+#define isinf(X) (!finite(X) && !isnan(X))
#endif
/* Define missing math constants. */