diff options
| author | unknown <mysqldev@build.mysql2.com> | 2003-05-16 13:03:47 +0200 |
|---|---|---|
| committer | unknown <mysqldev@build.mysql2.com> | 2003-05-16 13:03:47 +0200 |
| commit | 71df0f640a8b03468a59193ae3de5ed54483f34c (patch) | |
| tree | 05f1c3ffe8932df4cffdb9ecdf7c1f0d67e2bf1d | |
| parent | 43d371409589e835779a6236050ce92bb7344dae (diff) | |
| download | mariadb-git-71df0f640a8b03468a59193ae3de5ed54483f34c.tar.gz | |
my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
- fixed rint(A) #define as it was causing compile errors on QNX
include/my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
- fixed rint(A) #define as it was causing compile errors on QNX
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | include/my_global.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 8074f38541a..c0e329b1c8d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -62,6 +62,7 @@ monty@work.mysql.com mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@work.mysql.com +mysqldev@build.mysql2.com nick@mysql.com nick@nick.leippe.com paul@central.snake.net diff --git a/include/my_global.h b/include/my_global.h index 31375de30da..15495c60dd7 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -291,7 +291,6 @@ C_MODE_END #define HAVE_ERRNO_AS_DEFINE #define HAVE_FCNTL_LOCK #undef HAVE_FINITE -#undef HAVE_RINT #undef LONGLONG_MIN /* These get wrongly defined in QNX 6.2 */ #undef LONGLONG_MAX /* standard system library 'limits.h' */ #endif @@ -360,7 +359,7 @@ typedef unsigned short ushort; #define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1)) #define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0]))) #ifndef HAVE_RINT -#define rint(A) floor((A)+((A) < 0) -0.5 : 0.5) +#define rint(A) floor((A)+(((A) < 0)? -0.5 : 0.5)) #endif /* Define some general constants */ |