diff options
| author | msvensson@pilot.blaudden <> | 2007-04-24 11:16:56 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-24 11:16:56 +0200 |
| commit | f028e17ab7f4a716bf3510ec67ec3a43a665d00e (patch) | |
| tree | 3571b16f7ee0a251f09e76267d5f0efff3174b7e /include | |
| parent | 4a1fd222cea3cb2297870761ca60538e1a271b07 (diff) | |
| parent | c405f94cfb352a0909f040a4ad62462b77e81bf8 (diff) | |
| download | mariadb-git-f028e17ab7f4a716bf3510ec67ec3a43a665d00e.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 800457c0e73..d4f9223ccac 100644 --- 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 |