diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 03:14:44 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 03:14:44 +0300 |
| commit | a9c47d8cfc9d93dd93409c3d3681a4f726a456e5 (patch) | |
| tree | e700bcb0baacd3c2e36818839eb18c8744ddf5dd /include/my_global.h | |
| parent | 7448e105224e2b3808789ab2b77e0268acf45321 (diff) | |
| download | mariadb-git-a9c47d8cfc9d93dd93409c3d3681a4f726a456e5.tar.gz | |
Fix for Intel compiler (ecc)
Minor cleanups to other patches.
Make --temp-pool default
Docs/manual.texi:
Changelog
configure.in:
Fix for Intel compiler (ecc)
include/my_global.h:
Cleaned up QNX specific code.
include/my_pthread.h:
Safety
include/my_semaphore.h:
Cleaned up BSDI fix.
mysys/my_pthread.c:
Code comments
mysys/my_semaphore.c:
Fix for BSDI
sql/mysqld.cc:
Make --temp-pool default
sql/sql_parse.cc:
Safety
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/include/my_global.h b/include/my_global.h index c4a11a42541..e65e803c335 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -121,14 +121,6 @@ /* #define _AIX32_CURSES */ /* XXX: this breaks AIX 4.3.3 (others?). */ #endif -#ifdef __QNXNTO__ -#define HAVE_ERRNO_AS_DEFINE -#define HAVE_FCNTL_LOCK -#undef HAVE_SYS_UN_H -#undef HAVE_FINITE -#undef HAVE_RINT -#endif - #ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */ #undef HAVE_SNPRINTF #endif @@ -253,6 +245,17 @@ #define setrlimit cma_setrlimit64 #endif +#ifdef __QNXNTO__ +/* This has to be after include limits.h */ +#define HAVE_ERRNO_AS_DEFINE +#define HAVE_FCNTL_LOCK +#undef HAVE_SYS_UN_H +#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 + /* We can not live without the following defines */ #define USE_MYFUNC 1 /* Must use syscall indirection */ @@ -548,11 +551,6 @@ extern double my_atof(const char*); #define HAVE_LONG_LONG 1 #endif -#ifdef __QNXNTO__ -#undef LONGLONG_MIN /* These get wrongly defined in QNX 6.2 */ -#undef LONGLONG_MAX /* standard system library 'limits.h' */ -#endif - #if defined(HAVE_LONG_LONG) && !defined(LONGLONG_MIN) #define LONGLONG_MIN ((long long) 0x8000000000000000LL) #define LONGLONG_MAX ((long long) 0x7FFFFFFFFFFFFFFFLL) |