diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-24 11:16:56 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-24 11:16:56 +0200 |
| commit | de71b10745f60224444873213e76a6c291a0cb1a (patch) | |
| tree | 3571b16f7ee0a251f09e76267d5f0efff3174b7e /include | |
| parent | 83689eb08d0ee2b62e754fca1febbfc5604abbd4 (diff) | |
| parent | aeb896d601eb3626f4df5b9625a14233fb03417c (diff) | |
| download | mariadb-git-de71b10745f60224444873213e76a6c291a0cb1a.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
include/my_global.h:
Auto merged
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 |