mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 00:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix for Intel compiler (ecc)

Browse source 
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
This commit is contained in:
unknown 2002-08-08 03:14:44 +03:00
commit a9c47d8cfc
9 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
include/my_global.h
View file

@ -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)

3
include/my_pthread.h
View file

@ -430,8 +430,9 @@ struct tm *localtime_r(const time_t *clock, struct tm *res);
#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
#undef pthread_cond_timedwait
#undef pthread_mutex_trylock
#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a))
#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a))
int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
struct timespec *abstime);
int my_pthread_mutex_trylock(pthread_mutex_t *mutex);

6
include/my_semaphore.h
View file

@ -35,8 +35,6 @@ C_MODE_START
#ifdef HAVE_SEMAPHORE_H
#include <semaphore.h>
#elif defined(__bsdi__)
#include <sys/errno.h>
#else
#ifdef __WIN__
typedef HANDLE sem_t;
#else
@ -45,7 +43,7 @@ typedef struct {
pthread_cond_t cond;
uint count;
} sem_t;
#endif
#endif /* __WIN__ */
int sem_init(sem_t * sem, int pshared, unsigned int value);
int sem_destroy(sem_t * sem);
@ -55,7 +53,7 @@ int sem_post(sem_t * sem);
int sem_post_multiple(sem_t * sem, unsigned int count);
int sem_getvalue(sem_t * sem, unsigned int * sval);
#endif
#endif /* !__bsdi__ */
C_MODE_END
#endif /* !_my_semaphore_h_ */