From 25373555f838ec7f9a7a1625e66c7d83108a62f2 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Wed, 18 Mar 2015 10:35:33 -0400 Subject: [PATCH] Do not redeclare mutexes for darwin Partially revert commit e2e93aa8920c0b1bfc672a555a59eb4e15dbeaae, which added local declarations for des_init_mutex, des_random_mutex, and rxkad_random_mutex to a number of files in libadmin, apparently to fix the build on macos 10.3. That OS is long EoL-ed, and more recent versions of OS X include toolchains that do not need these extra declarations. In particular, the extra declarations can be harmful when these files start to pull in more symbols from our libraries (e.g., libafscp), since the details of the linking process can cause that to generate duplicate symbol errors. There is no longer any need to have local declarations of these symbols for OS X, so just remove them. Change-Id: Ie152387b4bd16b470054821fc8ddf852e1a4285c Reviewed-on: http://gerrit.openafs.org/11798 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- src/libadmin/samples/cm_client_config.c | 6 ------ src/libadmin/samples/cm_list_cells.c | 6 ------ src/libadmin/samples/cm_local_cell.c | 6 ------ src/libadmin/samples/cm_server_prefs.c | 6 ------ src/libadmin/samples/rxdebug_basic_stats.c | 6 ------ src/libadmin/samples/rxdebug_conns.c | 6 ------ src/libadmin/samples/rxdebug_peers.c | 6 ------ src/libadmin/samples/rxdebug_rx_stats.c | 6 ------ src/libadmin/samples/rxdebug_supported_stats.c | 6 ------ src/libadmin/samples/rxdebug_version.c | 6 ------ src/libadmin/samples/rxstat_clear_peer.c | 6 ------ src/libadmin/samples/rxstat_clear_process.c | 6 ------ src/libadmin/samples/rxstat_disable_peer.c | 6 ------ src/libadmin/samples/rxstat_disable_process.c | 6 ------ src/libadmin/samples/rxstat_enable_peer.c | 6 ------ src/libadmin/samples/rxstat_enable_process.c | 6 ------ src/libadmin/samples/rxstat_get_peer.c | 6 ------ src/libadmin/samples/rxstat_get_process.c | 6 ------ src/libadmin/samples/rxstat_get_version.c | 6 ------ src/libadmin/samples/rxstat_query_peer.c | 6 ------ src/libadmin/samples/rxstat_query_process.c | 6 ------ src/libadmin/test/afscp.c | 5 ----- 22 files changed, 131 deletions(-) diff --git a/src/libadmin/samples/cm_client_config.c b/src/libadmin/samples/cm_client_config.c index 34dd62aa9..1b758f3be 100644 --- a/src/libadmin/samples/cm_client_config.c +++ b/src/libadmin/samples/cm_client_config.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/cm_list_cells.c b/src/libadmin/samples/cm_list_cells.c index b85d58c06..2034c876d 100644 --- a/src/libadmin/samples/cm_list_cells.c +++ b/src/libadmin/samples/cm_list_cells.c @@ -26,12 +26,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c index 9803a5ec4..ee2cfdf57 100644 --- a/src/libadmin/samples/cm_local_cell.c +++ b/src/libadmin/samples/cm_local_cell.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/cm_server_prefs.c b/src/libadmin/samples/cm_server_prefs.c index 2e2d0295c..d9fd7844d 100644 --- a/src/libadmin/samples/cm_server_prefs.c +++ b/src/libadmin/samples/cm_server_prefs.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxdebug_basic_stats.c b/src/libadmin/samples/rxdebug_basic_stats.c index 2e5ca0008..d4a987fd1 100644 --- a/src/libadmin/samples/rxdebug_basic_stats.c +++ b/src/libadmin/samples/rxdebug_basic_stats.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxdebug_conns.c b/src/libadmin/samples/rxdebug_conns.c index bd623d6d2..a3c1b6797 100644 --- a/src/libadmin/samples/rxdebug_conns.c +++ b/src/libadmin/samples/rxdebug_conns.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxdebug_peers.c b/src/libadmin/samples/rxdebug_peers.c index 2438a66be..35ba342ae 100644 --- a/src/libadmin/samples/rxdebug_peers.c +++ b/src/libadmin/samples/rxdebug_peers.c @@ -33,12 +33,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c index 6dbf9f7cb..4da26115b 100644 --- a/src/libadmin/samples/rxdebug_rx_stats.c +++ b/src/libadmin/samples/rxdebug_rx_stats.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxdebug_supported_stats.c b/src/libadmin/samples/rxdebug_supported_stats.c index 0169d2db1..be5e440fc 100644 --- a/src/libadmin/samples/rxdebug_supported_stats.c +++ b/src/libadmin/samples/rxdebug_supported_stats.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxdebug_version.c b/src/libadmin/samples/rxdebug_version.c index 4721f43e5..cf59dbbe6 100644 --- a/src/libadmin/samples/rxdebug_version.c +++ b/src/libadmin/samples/rxdebug_version.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_clear_peer.c b/src/libadmin/samples/rxstat_clear_peer.c index 6d9d47d44..6d89d5233 100644 --- a/src/libadmin/samples/rxstat_clear_peer.c +++ b/src/libadmin/samples/rxstat_clear_peer.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_clear_process.c b/src/libadmin/samples/rxstat_clear_process.c index d9742a6d7..8cb94093f 100644 --- a/src/libadmin/samples/rxstat_clear_process.c +++ b/src/libadmin/samples/rxstat_clear_process.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_disable_peer.c b/src/libadmin/samples/rxstat_disable_peer.c index a18d8ea86..71a7e6ed6 100644 --- a/src/libadmin/samples/rxstat_disable_peer.c +++ b/src/libadmin/samples/rxstat_disable_peer.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_disable_process.c b/src/libadmin/samples/rxstat_disable_process.c index e06c1d290..7374f0e33 100644 --- a/src/libadmin/samples/rxstat_disable_process.c +++ b/src/libadmin/samples/rxstat_disable_process.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_enable_peer.c b/src/libadmin/samples/rxstat_enable_peer.c index 8d8a1a569..a4234b6cf 100644 --- a/src/libadmin/samples/rxstat_enable_peer.c +++ b/src/libadmin/samples/rxstat_enable_peer.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_enable_process.c b/src/libadmin/samples/rxstat_enable_process.c index 4489daa59..bdcd0c221 100644 --- a/src/libadmin/samples/rxstat_enable_process.c +++ b/src/libadmin/samples/rxstat_enable_process.c @@ -28,12 +28,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c index cc4bd7a5a..f5dc4edf1 100644 --- a/src/libadmin/samples/rxstat_get_peer.c +++ b/src/libadmin/samples/rxstat_get_peer.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - #include #define FSINT_COMMON_XG #include diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c index 2e53dac7b..cd1a87767 100644 --- a/src/libadmin/samples/rxstat_get_process.c +++ b/src/libadmin/samples/rxstat_get_process.c @@ -29,12 +29,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - #include #define FSINT_COMMON_XG #include diff --git a/src/libadmin/samples/rxstat_get_version.c b/src/libadmin/samples/rxstat_get_version.c index 4d53771bf..42edf5b26 100644 --- a/src/libadmin/samples/rxstat_get_version.c +++ b/src/libadmin/samples/rxstat_get_version.c @@ -28,12 +28,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_query_peer.c b/src/libadmin/samples/rxstat_query_peer.c index d52199cd7..174c399dd 100644 --- a/src/libadmin/samples/rxstat_query_peer.c +++ b/src/libadmin/samples/rxstat_query_peer.c @@ -28,12 +28,6 @@ #include #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/samples/rxstat_query_process.c b/src/libadmin/samples/rxstat_query_process.c index eed20910f..5dc00b830 100644 --- a/src/libadmin/samples/rxstat_query_process.c +++ b/src/libadmin/samples/rxstat_query_process.c @@ -29,12 +29,6 @@ #include -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ - void Usage(void) { diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c index 4eb0c3ed6..bb21a3ede 100644 --- a/src/libadmin/test/afscp.c +++ b/src/libadmin/test/afscp.c @@ -44,11 +44,6 @@ void *cellHandle; void *tokenHandle; int existing_tokens = 0; -#ifdef AFS_DARWIN_ENV -pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* AFS_DARWIN_ENV */ /* * Before processing any command, process the common arguments and -- 2.39.5