diff options
| author | unknown <serg@infomag.ape.relarn.ru> | 2000-09-01 15:25:17 +0400 |
|---|---|---|
| committer | unknown <serg@infomag.ape.relarn.ru> | 2000-09-01 15:25:17 +0400 |
| commit | 8d0dafe3e85713cb4b0a399a699bdfc9f6434464 (patch) | |
| tree | 453666e95fe1f2a813f167f75da1a0e3fe18e185 /include | |
| parent | 57b130262946b372b216cce29a1b32ba4acb145a (diff) | |
| parent | 3210b3f65fac214cfc8a9569028b7dfffa4f6543 (diff) | |
| download | mariadb-git-8d0dafe3e85713cb4b0a399a699bdfc9f6434464.tar.gz | |
Merge serg@work.mysql.com:/home/bk/mysql
into infomag.ape.relarn.ru:/usr/home/serg/src/mysql.safe/bk/mysql
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 2a77624b233..19c39d76ef3 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -279,7 +279,7 @@ extern int my_pthread_create_detached; #endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */ #if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910 -int sigwait(const sigset_t *set, int *sig); +int sigwait(sigset_t *set, int *sig); #endif #if defined(HAVE_UNIXWARE7_POSIX) @@ -290,7 +290,7 @@ int sigwait(const sigset_t *set, int *sig); #ifndef HAVE_NONPOSIX_SIGWAIT #define my_sigwait(A,B) sigwait((A),(B)) #else -int my_sigwait(sigset_t *set,int *sig); +int my_sigwait(const sigset_t *set,int *sig); #endif #ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT @@ -309,7 +309,7 @@ extern int my_pthread_cond_init(pthread_cond_t *mp, #endif #if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX) -int sigwait(const sigset_t *setp, int *sigp); /* Use our implemention */ +int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ #endif #if !defined(HAVE_SIGSET) && !defined(HAVE_mit_thread) && !defined(sigset) #define sigset(A,B) do { struct sigaction s; sigset_t set; \ |