* include/arch/unix/apr_arch_proc_mutex.h, locks/unix/proc_mutex.c:

Don't define global symbols for the _methods structures.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65165 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 31 deletions

diff --git a/include/arch/unix/apr_arch_proc_mutex.h b/include/arch/unix/apr_arch_proc_mutex.h
index 7da97b7a8..40dcc7e1f 100644
--- a/include/arch/unix/apr_arch_proc_mutex.h
+++ b/include/arch/unix/apr_arch_proc_mutex.h
@@ -81,22 +81,6 @@ typedef struct apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_lock_metho
 /* 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;
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index 666df393f..a401f15fc 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -143,7 +143,7 @@ static apr_status_t proc_mutex_posix_release(apr_proc_mutex_t *mutex)
     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 @@ static apr_status_t proc_mutex_sysv_release(apr_proc_mutex_t *mutex)
     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 @@ static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
     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 @@ static apr_status_t proc_mutex_fcntl_release(apr_proc_mutex_t *mutex)
     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 @@ static apr_status_t proc_mutex_flock_child_init(apr_proc_mutex_t **mutex,
     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 @@ static apr_status_t proc_mutex_choose_method(apr_proc_mutex_t *new_mutex, apr_lo
     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