Commit 41e048e0 authored by unknown's avatar unknown
Browse files

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
parents 87b7e20e 502aa66c

include/my_global.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */