diff options
| author | unknown <joerg@mysql.com> | 2005-09-08 11:04:43 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-09-08 11:04:43 +0200 |
| commit | 796f5e00451d16f8be464722be9d5b00890366fc (patch) | |
| tree | 756b3da507ec3ed81ee3a76cab3ea3807bd04e6b /include | |
| parent | 1f776a5a45f84dfb4c4e28ef618d7edf1ab048de (diff) | |
| parent | a46d6b0c0c05b5c6275abec1bd861105bd5b88f6 (diff) | |
| download | mariadb-git-796f5e00451d16f8be464722be9d5b00890366fc.tar.gz | |
Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0
configure.in:
Auto merged
include/my_global.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 4b2e27aa3f6..aed4ee4fa01 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -297,6 +297,11 @@ C_MODE_END #undef HAVE_FINITE #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 */ +#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 #endif /* We can not live without the following defines */ |