diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /mysys/my_pthread.c | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index dee34d10b38..a13cd9b3545 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -360,7 +360,8 @@ int sigwait(sigset_t *setp, int *sigp) #include <netdb.h> -int my_pthread_mutex_init(pthread_mutex_t *mp, const pthread_mutexattr_t *attr) +int my_pthread_mutex_noposix_init(pthread_mutex_t *mp, + const pthread_mutexattr_t *attr) { int error; if (!attr) @@ -370,7 +371,8 @@ int my_pthread_mutex_init(pthread_mutex_t *mp, const pthread_mutexattr_t *attr) return error; } -int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr) +int my_pthread_cond_noposix_init(pthread_cond_t *mp, + const pthread_condattr_t *attr) { int error; if (!attr) |