summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBen Laurie <ben@apache.org>2000-01-23 01:13:47 +0000
committerBen Laurie <ben@apache.org>2000-01-23 01:13:47 +0000
commit5fc451a5ff55063d0dbbf100d1a2a15c2b7f69b4 (patch)
treec0064c71408e1eafbedd4e36c22e10d66a68a45d /include
parentdf5e516d60b657cf026fd4f8309a4f8ffee2245b (diff)
downloadapr-5fc451a5ff55063d0dbbf100d1a2a15c2b7f69b4.tar.gz
Make interprocess mutexes actually choose, fix semaphore mutexes.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@59613 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/apr_portable.h3
-rw-r--r--include/arch/unix/locks.h5
2 files changed, 7 insertions, 1 deletions
diff --git a/include/apr_portable.h b/include/apr_portable.h
index 1dd1a10c8..29d9a3ea3 100644
--- a/include/apr_portable.h
+++ b/include/apr_portable.h
@@ -81,6 +81,9 @@ extern "C" {
#if APR_HAVE_PTHREAD_H
#include <pthread.h>
#endif
+#ifdef HAVE_STRUCT_UNION_SEMUN
+#include <sys/sem.h>
+#endif
#ifdef WIN32
/* The primitives for Windows types */
diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h
index ab7a0c077..eae45ce51 100644
--- a/include/arch/unix/locks.h
+++ b/include/arch/unix/locks.h
@@ -88,6 +88,9 @@
#if HAVE_FCNTL_H
#include <fcntl.h>
#endif
+#ifdef HAVE_STRUCT_UNION_SEMUN
+#include <sys/sem.h>
+#endif
#if APR_HAS_THREADS
#if HAVE_PTHREAD_H
@@ -96,7 +99,7 @@
#endif
/* End System Headers */
-#ifndef HAVE_UNION_SEMUN
+#ifndef HAVE_STRUCT_UNION_SEMUN
/* it makes no sense, but this isn't defined on solaris */
union semun {
long val;