summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-04-16 21:19:00 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-04-16 21:19:00 +0300
commitb83e6fe1ad970c4b3192e6fdc834642cd5cde80c (patch)
tree8d0944dae60c3fe9d89902e47d78a99b64c04dbf
parent667da1396b5a20ad7b4ba94136e47e64b6368daa (diff)
downloadmariadb-git-b83e6fe1ad970c4b3192e6fdc834642cd5cde80c.tar.gz
Small fix for HP-UX 10.20 with DCE threads
Also --with-libwrap is tested on Linux just fine. configure.in: Small fix for HP-UX 10.20 with DCE threads include/my_pthread.h: Small fix for HP-UX 10.20 with DCE threads mysys/my_pthread.c: Small fix for HP-UX 10.20 with DCE threads
-rw-r--r--configure.in1
-rw-r--r--include/my_pthread.h2
-rw-r--r--mysys/my_pthread.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 5e6efe8ea5d..8f31e58e397 100644
--- a/configure.in
+++ b/configure.in
@@ -853,6 +853,7 @@ case $SYSTEM_TYPE in
echo "Using --with-named-thread=-lpthread"
with_named_thread="-lcma"
fi
+ AC_DEFINE(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT)
;;
*hpux11.*)
echo "Enabling pread/pwrite workaround for hpux 11"
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 30e9ea95e02..4c90882e76b 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -349,7 +349,7 @@ extern void my_pthread_attr_setprio(pthread_attr_t *attr, int priority);
#undef HAVE_GETHOSTBYADDR_R /* No definition */
#endif
-#if defined(HAVE_DEC_THREADS)
+#if defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT)
extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
pthread_mutex_t *mutex,
struct timespec *abstime);
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 8c6b366e9b1..72409b6aa86 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -412,7 +412,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr)
/* Change functions on HP to work according to POSIX */
-#ifdef HAVE_DEC_THREADS
+#ifdef HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT
#undef pthread_cond_timedwait
int my_pthread_cond_timedwait(pthread_cond_t *cond,
@@ -422,7 +422,7 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond,
int error=pthread_cond_timedwait(cond,mutex,abstime);
return error == EAGAIN ? ETIMEDOUT : error;
}
-#endif /* HAVE_DEC_THREADS */
+#endif /* HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT */
/*
Emulate SOLARIS style calls, not because it's better, but just to make the