From 7c375fe24c7e25d7df8615177da8286b5debadac Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Aug 2002 03:14:44 +0300 Subject: 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 --- include/my_semaphore.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/my_semaphore.h') diff --git a/include/my_semaphore.h b/include/my_semaphore.h index e08138495f7..0deac1a60d1 100644 --- a/include/my_semaphore.h +++ b/include/my_semaphore.h @@ -35,8 +35,6 @@ C_MODE_START #ifdef HAVE_SEMAPHORE_H #include #elif defined(__bsdi__) -#include -#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_ */ -- cgit v1.2.1