Merge bk-internal:/home/bk/mysql-4.0/

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

include/my_semaphore.h

@@ -31,6 +31,8 @@
 #ifndef _my_semaphore_h_
 #define _my_semaphore_h_
 
+#ifdef THREAD
+
 C_MODE_START
 #ifdef HAVE_SEMAPHORE_H
 #include <semaphore.h>
@@ -56,4 +58,7 @@ int sem_getvalue(sem_t * sem, unsigned int * sval);
 #endif /* !__bsdi__ */
 
 C_MODE_END
+
+#endif /* THREAD */
+
 #endif /* !_my_semaphore_h_ */

mysys/my_semaphore.c

@@ -23,7 +23,7 @@
 #include <my_semaphore.h>
 #include <errno.h>
 
-#if !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H)
+#if !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H) && defined(THREAD)
 
 int sem_init(sem_t * sem, int pshared, uint value)
 {
@@ -101,4 +101,4 @@ int sem_getvalue(sem_t * sem, uint *sval)
   return 0;
 }
 
-#endif /* !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H) */
+#endif /* !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H) && defined(THREAD) */