jorton 2004/06/05 06:33:19
Modified: include/arch/unix apr_arch_proc_mutex.h
locks/unix proc_mutex.c
Log:
* include/arch/unix/apr_arch_proc_mutex.h, locks/unix/proc_mutex.c:
Don't define global symbols for the _methods structures.
Revision Changes Path
1.6 +0 -16 apr/include/arch/unix/apr_arch_proc_mutex.h
Index: apr_arch_proc_mutex.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/apr_arch_proc_mutex.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -d -w -u -r1.5 -r1.6
--- apr_arch_proc_mutex.h 5 Jun 2004 11:52:43 -0000 1.5
+++ apr_arch_proc_mutex.h 5 Jun 2004 13:33:19 -0000 1.6
@@ -81,22 +81,6 @@
/* bit values for flags field in apr_unix_lock_methods_t */
#define APR_PROCESS_LOCK_MECH_IS_GLOBAL 1
-#if APR_HAS_POSIXSEM_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t
apr_proc_mutex_unix_posix_methods;
-#endif
-#if APR_HAS_SYSVSEM_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t
apr_proc_mutex_unix_sysv_methods;
-#endif
-#if APR_HAS_FCNTL_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t
apr_proc_mutex_unix_fcntl_methods;
-#endif
-#if APR_HAS_FLOCK_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t
apr_proc_mutex_unix_flock_methods;
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t
apr_proc_mutex_unix_proc_pthread_methods;
-#endif
-
#if !APR_HAVE_UNION_SEMUN && defined(APR_HAS_SYSVSEM_SERIALIZE)
union semun {
int val;
1.39 +15 -15 apr/locks/unix/proc_mutex.c
Index: proc_mutex.c
===================================================================
RCS file: /home/cvs/apr/locks/unix/proc_mutex.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -d -w -u -r1.38 -r1.39
--- proc_mutex.c 5 Jun 2004 11:39:03 -0000 1.38
+++ proc_mutex.c 5 Jun 2004 13:33:19 -0000 1.39
@@ -143,7 +143,7 @@
return APR_SUCCESS;
}
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_posix_methods =
+static const apr_proc_mutex_unix_lock_methods_t mutex_posixsem_methods =
{
#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS ||
defined(POSIXSEM_IS_GLOBAL)
APR_PROCESS_LOCK_MECH_IS_GLOBAL,
@@ -243,7 +243,7 @@
return APR_SUCCESS;
}
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_sysv_methods =
+static const apr_proc_mutex_unix_lock_methods_t mutex_sysv_methods =
{
#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS ||
defined(SYSVSEM_IS_GLOBAL)
APR_PROCESS_LOCK_MECH_IS_GLOBAL,
@@ -399,7 +399,7 @@
return APR_SUCCESS;
}
-const apr_proc_mutex_unix_lock_methods_t
apr_proc_mutex_unix_proc_pthread_methods =
+static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_methods =
{
APR_PROCESS_LOCK_MECH_IS_GLOBAL,
proc_mutex_proc_pthread_create,
@@ -511,7 +511,7 @@
return APR_SUCCESS;
}
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_fcntl_methods =
+static const apr_proc_mutex_unix_lock_methods_t mutex_fcntl_methods =
{
#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS ||
defined(FCNTL_IS_GLOBAL)
APR_PROCESS_LOCK_MECH_IS_GLOBAL,
@@ -632,7 +632,7 @@
return APR_SUCCESS;
}
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_flock_methods =
+static const apr_proc_mutex_unix_lock_methods_t mutex_flock_methods =
{
#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS ||
defined(FLOCK_IS_GLOBAL)
APR_PROCESS_LOCK_MECH_IS_GLOBAL,
@@ -666,50 +666,50 @@
switch (mech) {
case APR_LOCK_FCNTL:
#if APR_HAS_FCNTL_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_fcntl_methods;
+ new_mutex->inter_meth = &mutex_fcntl_methods;
#else
return APR_ENOTIMPL;
#endif
break;
case APR_LOCK_FLOCK:
#if APR_HAS_FLOCK_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_flock_methods;
+ new_mutex->inter_meth = &mutex_flock_methods;
#else
return APR_ENOTIMPL;
#endif
break;
case APR_LOCK_SYSVSEM:
#if APR_HAS_SYSVSEM_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_sysv_methods;
+ new_mutex->inter_meth = &mutex_sysv_methods;
#else
return APR_ENOTIMPL;
#endif
break;
case APR_LOCK_POSIXSEM:
#if APR_HAS_POSIXSEM_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_posix_methods;
+ new_mutex->inter_meth = &mutex_posixsem_methods;
#else
return APR_ENOTIMPL;
#endif
break;
case APR_LOCK_PROC_PTHREAD:
#if APR_HAS_PROC_PTHREAD_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_proc_pthread_methods;
+ new_mutex->inter_meth = &mutex_proc_pthread_methods;
#else
return APR_ENOTIMPL;
#endif
break;
case APR_LOCK_DEFAULT:
#if APR_USE_FLOCK_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_flock_methods;
+ new_mutex->inter_meth = &mutex_flock_methods;
#elif APR_USE_SYSVSEM_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_sysv_methods;
+ new_mutex->inter_meth = &mutex_sysv_methods;
#elif APR_USE_FCNTL_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_fcntl_methods;
+ new_mutex->inter_meth = &mutex_fcntl_methods;
#elif APR_USE_PROC_PTHREAD_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_proc_pthread_methods;
+ new_mutex->inter_meth = &mutex_proc_pthread_methods;
#elif APR_USE_POSIXSEM_SERIALIZE
- new_mutex->inter_meth = &apr_proc_mutex_unix_posix_methods;
+ new_mutex->inter_meth = &mutex_posixsem_methods;
#else
return APR_ENOTIMPL;
#endif
