diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-14 09:45:44 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-14 09:45:44 +0200 |
| commit | 59e6d10603ee77b053171832a9146010884b921d (patch) | |
| tree | b4626e590912055df7260bb3dc54f12e561a1d6a /include/my_global.h | |
| parent | 8943090c3333d9e469249833e15d66f1ab466fb6 (diff) | |
| parent | a8d4bfd168ab0e4d2fe545f1719e063e64196fcf (diff) | |
| download | mariadb-git-59e6d10603ee77b053171832a9146010884b921d.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
include/my_global.h:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9a485542cc0..486c0a59d23 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -432,7 +432,9 @@ extern "C" int madvise(void *addr, size_t len, int behav); #undef LONGLONG_MIN /* These get wrongly defined in QNX 6.2 */ #undef LONGLONG_MAX /* standard system library 'limits.h' */ #ifdef __cplusplus -#define HAVE_RINT /* rint() and isnan() functions are not */ +#ifndef HAVE_RINT +#define HAVE_RINT +#endif /* rint() and isnan() functions are not */ #define rint(a) std::rint(a) /* visible in C++ scope due to an error */ #define isnan(a) std::isnan(a) /* in the usr/include/math.h on QNX */ #endif |