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 <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/libadmin/samples/cm_client_config.c b/src/libadmin/samples/cm_client_config.c
index 34dd62aa9bfd694ede895b87650707313e26465d..1b758f3bea994d8148b87eebe3200e81242cc527 100644 (file)
--- a/src/libadmin/samples/cm_client_config.c
+++ b/src/libadmin/samples/cm_client_config.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 b85d58c0635323a97fde28194a903e775e33b6f3..2034c876dd53b5b74b8d8d89fb5490faf5d4b483 100644 (file)
--- a/src/libadmin/samples/cm_list_cells.c
+++ b/src/libadmin/samples/cm_list_cells.c
@@ -26,12 +26,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 9803a5ec45ae833e14823b70cca51e49ded52baa..ee2cfdf574e61fc632e97bfe9f2427c4334baf01 100644 (file)
--- a/src/libadmin/samples/cm_local_cell.c
+++ b/src/libadmin/samples/cm_local_cell.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 2e2d0295c2744107af866d2a4de6339df7451115..d9fd7844d229a10b2b968b66aef8e3c16c51db66 100644 (file)
--- a/src/libadmin/samples/cm_server_prefs.c
+++ b/src/libadmin/samples/cm_server_prefs.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 2e5ca0008bb30924678e1297415382267c0a988a..d4a987fd1bc280de1859952dfa2928188a3d9a90 100644 (file)
--- a/src/libadmin/samples/rxdebug_basic_stats.c
+++ b/src/libadmin/samples/rxdebug_basic_stats.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 bd623d6d2d2c99ce523b018e71c39900b4f585d4..a3c1b6797d04443d7510b5fc80bd4953d5cf6804 100644 (file)
--- a/src/libadmin/samples/rxdebug_conns.c
+++ b/src/libadmin/samples/rxdebug_conns.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 2438a66be2d2d93254d906e6ea282f8803cab9ad..35ba342aef1616f0869bc0085f2e280e6bb91f55 100644 (file)
--- a/src/libadmin/samples/rxdebug_peers.c
+++ b/src/libadmin/samples/rxdebug_peers.c
@@ -33,12 +33,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 6dbf9f7cb9c807f1fcb83f69c81c8f9227950fa8..4da26115b7a8022dce0bcfd598ce50331c4f48d1 100644 (file)
--- a/src/libadmin/samples/rxdebug_rx_stats.c
+++ b/src/libadmin/samples/rxdebug_rx_stats.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 0169d2db12dcaa94b1f35cd290dec6f9e6029f24..be5e440fcee17d655669db7082a67f76e46f9728 100644 (file)
--- a/src/libadmin/samples/rxdebug_supported_stats.c
+++ b/src/libadmin/samples/rxdebug_supported_stats.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 4721f43e5d008aaec761e1d82f2bb0a630479df6..cf59dbbe69d6df404117953eb69f9e79bfe165d7 100644 (file)
--- a/src/libadmin/samples/rxdebug_version.c
+++ b/src/libadmin/samples/rxdebug_version.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 6d9d47d44233105b92bdcd2f970d803dbfa755c8..6d89d5233e780e8fffa8d7f81bbcc6fed6b5d57b 100644 (file)
--- a/src/libadmin/samples/rxstat_clear_peer.c
+++ b/src/libadmin/samples/rxstat_clear_peer.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 d9742a6d767d264fc40e044e7415f69f643b1911..8cb94093f429d09cbb8c6022d3cbd7c938e460e8 100644 (file)
--- a/src/libadmin/samples/rxstat_clear_process.c
+++ b/src/libadmin/samples/rxstat_clear_process.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 a18d8ea862f87c995caa3b50e7f3382106cbd468..71a7e6ed68a8c2b63ff13cfd1918bc4eaedec02c 100644 (file)
--- a/src/libadmin/samples/rxstat_disable_peer.c
+++ b/src/libadmin/samples/rxstat_disable_peer.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 e06c1d2905f38ed2ffab9288c919082b3ee418df..7374f0e338f1a21c7c2394140e52db3bf42ccdb6 100644 (file)
--- a/src/libadmin/samples/rxstat_disable_process.c
+++ b/src/libadmin/samples/rxstat_disable_process.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 8d8a1a5692e4d5ee7f565489ac8fc4ccfe859ace..a4234b6cf53a8ece239e8d309d949dcdd2cfbccd 100644 (file)
--- a/src/libadmin/samples/rxstat_enable_peer.c
+++ b/src/libadmin/samples/rxstat_enable_peer.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 4489daa591318805b6e5adbab7fd51178bc1dc66..bdcd0c2219f3af98156fa70ec9fecebe9acedc1e 100644 (file)
--- a/src/libadmin/samples/rxstat_enable_process.c
+++ b/src/libadmin/samples/rxstat_enable_process.c
@@ -28,12 +28,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 cc4bd7a5a00c5e0b9dc6d172564f2ab15e08f3bf..f5dc4edf1456748cf37e153bdc92305dec06c349 100644 (file)
--- a/src/libadmin/samples/rxstat_get_peer.c
+++ b/src/libadmin/samples/rxstat_get_peer.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 <afs/afsint.h>
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>

diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c
index 2e53dac7b9ad04e328376a1d4f67ddf4e0a818c8..cd1a877671e73fff24910d9977fbcb7e5871df81 100644 (file)
--- a/src/libadmin/samples/rxstat_get_process.c
+++ b/src/libadmin/samples/rxstat_get_process.c
@@ -29,12 +29,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 <afs/afsint.h>
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>

diff --git a/src/libadmin/samples/rxstat_get_version.c b/src/libadmin/samples/rxstat_get_version.c
index 4d53771bfc3c3791dd07ae7170e40245f477ba1b..42edf5b26f35993ae25b1a60f207984a669b8efb 100644 (file)
--- a/src/libadmin/samples/rxstat_get_version.c
+++ b/src/libadmin/samples/rxstat_get_version.c
@@ -28,12 +28,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 d52199cd77eaf7ef44c895279874661fa09fa4f4..174c399ddeaff081d36e1296c948425fec9b6e39 100644 (file)
--- a/src/libadmin/samples/rxstat_query_peer.c
+++ b/src/libadmin/samples/rxstat_query_peer.c
@@ -28,12 +28,6 @@
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
 
-#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 eed20910f4a3d8de9f6a2eece960fc06639cdf43..5dc00b830ecc252b1bf37144f579c4927a89c9eb 100644 (file)
--- a/src/libadmin/samples/rxstat_query_process.c
+++ b/src/libadmin/samples/rxstat_query_process.c
@@ -29,12 +29,6 @@
 #include <afs/afs_utilAdmin.h>
 
 
-#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 4eb0c3ed653f8ad1c6682be3035f04d265c9b98c..bb21a3edeab039013e9b6fe4b961b9cf6a875ece 100644 (file)
--- 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