diff options
| author | unknown <ramil@mysql.com> | 2005-07-06 14:01:30 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-07-06 14:01:30 +0500 |
| commit | 41e048e0a6b8610a396d9788fc4bb6ef10f010ab (patch) | |
| tree | ac896caef8980bfb99fca40602d017918053b23f /include | |
| parent | 87b7e20ebd16f65b1d59597f2b5d8109ba6849aa (diff) | |
| parent | 502aa66c5c176341def1723c8ef24c3be78e8df1 (diff) | |
| download | mariadb-git-41e048e0a6b8610a396d9788fc4bb6ef10f010ab.tar.gz | |
Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
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 22ec6dfffd3..ec4c52b6ee4 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -339,6 +339,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 */ |