OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_76-4602-g2537355
Gerrit Code Review
gerrit@openafs.org
Sun, 22 Mar 2015 11:23:53 -0400
The following commit has been merged in the master branch:
commit 25373555f838ec7f9a7a1625e66c7d83108a62f2
Author: Benjamin Kaduk <kaduk@mit.edu>
Date: Wed Mar 18 10:35:33 2015 -0400
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>
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, 0 insertions(+), 131 deletions(-)
--
OpenAFS Master Repository