diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr.h.in | 5 | ||||
| -rw-r--r-- | include/apr.hw | 5 | ||||
| -rw-r--r-- | include/arch/unix/locks.h | 23 |
3 files changed, 14 insertions, 19 deletions
diff --git a/include/apr.h.in b/include/apr.h.in index db8277db1..ae898d3d8 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -64,6 +64,11 @@ #define APR_USE_PROC_PTHREAD_SERIALIZE @procpthreadser@ #define APR_USE_PTHREAD_SERIALIZE @pthreadser@ +#define APR_HAS_FLOCK_SERIALIZE @hasflockser@ +#define APR_HAS_SYSVSEM_SERIALIZE @hassysvser@ +#define APR_HAS_FCNTL_SERIALIZE @hasfcntlser@ +#define APR_HAS_PROC_PTHREAD_SERIALIZE @hasprocpthreadser@ + #define APR_HAS_LOCK_CREATE_NP @lockcreatenp@ #define APR_PROCESS_LOCK_IS_GLOBAL @proclockglobal@ diff --git a/include/apr.hw b/include/apr.hw index 7cc8b1a0f..a5c57ae15 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -157,6 +157,11 @@ #define APR_USE_PROC_PTHREAD_SERIALIZE 0 #define APR_USE_PTHREAD_SERIALIZE 0 +#define APR_HAS_FLOCK_SERIALIZE 0 +#define APR_HAS_SYSVSEM_SERIALIZE 0 +#define APR_HAS_FCNTL_SERIALIZE 0 +#define APR_HAS_PROC_PTHREAD_SERIALIZE 0 + #define APR_HAS_LOCK_CREATE_NP 0 #define APR_PROCESS_LOCK_IS_GLOBAL 0 diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h index 02a96b97f..70b4476dd 100644 --- a/include/arch/unix/locks.h +++ b/include/arch/unix/locks.h @@ -109,32 +109,17 @@ struct apr_unix_lock_methods_t { }; typedef struct apr_unix_lock_methods_t apr_unix_lock_methods_t; -#if defined(HAVE_SEMCTL) && defined(HAVE_SEMGET) -#define APR_HAS_SYSVSEM_SERIALIZE 1 +#if APR_HAS_SYSVSEM_SERIALIZE extern const apr_unix_lock_methods_t apr_unix_sysv_methods; -#else -#define APR_HAS_SYSVSEM_SERIALIZE 0 #endif - -#if defined(HAVE_FCNTL_H) && defined(HAVE_F_SETLK) -#define APR_HAS_FCNTL_SERIALIZE 1 +#if APR_HAS_FCNTL_SERIALIZE extern const apr_unix_lock_methods_t apr_unix_fcntl_methods; -#else -#define APR_HAS_FCNTL_SERIALIZE 0 #endif - -#if defined(HAVE_FLOCK) && defined(HAVE_LOCK_EX) -#define APR_HAS_FLOCK_SERIALIZE 1 +#if APR_HAS_FLOCK_SERIALIZE extern const apr_unix_lock_methods_t apr_unix_flock_methods; -#else -#define APR_HAS_FLOCK_SERIALIZE 0 #endif - -#if defined(HAVE_PTHREAD_H) && defined(HAVE_PTHREAD_PROCESS_SHARED) && defined(HAVE_PTHREAD_MUTEXATTR_SETPSHARED) -#define APR_HAS_PROC_PTHREAD_SERIALIZE 1 +#if APR_HAS_PROC_PTHREAD_SERIALIZE extern const apr_unix_lock_methods_t apr_unix_proc_pthread_methods; -#else -#define APR_HAS_PROC_PTHREAD_SERIALIZE 0 #endif #if defined(HAVE_PTHREAD_RWLOCK_INIT) |