diff options
| author | unknown <serg@serg.mylan> | 2003-04-30 12:36:00 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-04-30 12:36:00 +0200 |
| commit | 679f39b9283b239379589629931c4b7a0483a148 (patch) | |
| tree | 0ffdb8b26e0909de1cac8052e9e9b185adaad247 | |
| parent | fff9e2722bff6792ea2527249c1122dcc6bb629a (diff) | |
| parent | 7a5b5d51b289497e3c1b3b807d9019026d65b02f (diff) | |
| download | mariadb-git-679f39b9283b239379589629931c4b7a0483a148.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | include/my_semaphore.h | 5 | ||||
| -rw-r--r-- | mysys/my_semaphore.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/my_semaphore.h b/include/my_semaphore.h index 3431212ec82..7f182bea6bf 100644 --- a/include/my_semaphore.h +++ b/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_ */ diff --git a/mysys/my_semaphore.c b/mysys/my_semaphore.c index 2dd224cd99e..aa216cbc289 100644 --- a/mysys/my_semaphore.c +++ b/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) */ |