diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-13 23:35:52 +0200 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-13 23:35:52 +0200 |
| commit | 74cbd71e94432e096562ed584fd2370883bdfd63 (patch) | |
| tree | 45d9abbd3b89bec4d4880130013f666463dccb90 /include/my_global.h | |
| parent | ab013df0806c83bf36d1ae4d4503ce8ff2caad84 (diff) | |
| parent | eac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff) | |
| download | mariadb-git-74cbd71e94432e096562ed584fd2370883bdfd63.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index e4b8496f4c2..aabc8d5d4b0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -488,9 +488,6 @@ C_MODE_END #include <sys/stream.h> /* HPUX 10.20 defines ulong here. UGLY !!! */ #define HAVE_ULONG #endif -#ifdef DONT_USE_FINITE /* HPUX 11.x has is_finite() */ -#undef HAVE_FINITE -#endif #if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD) /* Fix bug in setrlimit */ #undef setrlimit @@ -860,9 +857,13 @@ typedef SOCKET_SIZE_TYPE size_socket; #define SIZE_T_MAX ~((size_t) 0) #endif -#ifndef HAVE_FINITE +#ifndef isfinite +#ifdef HAVE_FINITE +#define isfinite(x) finite(x) +#else #define finite(x) (1.0 / fabs(x) > 0.0) -#endif +#endif /* HAVE_FINITE */ +#endif /* isfinite */ #ifndef HAVE_ISNAN #define isnan(x) ((x) != (x)) @@ -872,7 +873,7 @@ typedef SOCKET_SIZE_TYPE size_socket; /* isinf() can be used in both C and C++ code */ #define my_isinf(X) isinf(X) #else -#define my_isinf(X) (!finite(X) && !isnan(X)) +#define my_isinf(X) (!isfinite(X) && !isnan(X)) #endif /* Define missing math constants. */ |