diff options
| author | kaa@kaamos.(none) <> | 2008-03-12 11:19:46 +0300 |
|---|---|---|
| committer | kaa@kaamos.(none) <> | 2008-03-12 11:19:46 +0300 |
| commit | 0a7052e4d3633b818ab4050adcad646b888c5430 (patch) | |
| tree | f84e4ada799bf37a3d9ef074064f8a17f408aa89 /include/my_global.h | |
| parent | d4025ce1a60322635bf5f7adb765f4612563ee3a (diff) | |
| parent | 7e365efa30f5d42aaf87ce9044176e266ee337eb (diff) | |
| download | mariadb-git-0a7052e4d3633b818ab4050adcad646b888c5430.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
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 ab960a9e6cd..bc96ad65aee 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -486,9 +486,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 @@ -858,9 +855,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)) @@ -870,7 +871,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. */ |