From 11ae30333dfac1560870e2cd0f3557f007702f09 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Thu, 31 May 2007 22:47:40 +0000 Subject: [PATCH] strmode is a standard BSD function defined in string.h This commit was SVN r14828. --- orte/mca/oob/base/oob_base_xcast.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/orte/mca/oob/base/oob_base_xcast.c b/orte/mca/oob/base/oob_base_xcast.c index 8687ebd4d0..e7ef0a040c 100644 --- a/orte/mca/oob/base/oob_base_xcast.c +++ b/orte/mca/oob/base/oob_base_xcast.c @@ -46,7 +46,7 @@ /* Local variables */ static orte_std_cntr_t xcast_num_active; static bool xcast_in_progress=false; -static char *strmode[] = {"binomial", "linear", "direct", "unknown"}; +static char *mode_string[] = {"binomial", "linear", "direct", "unknown"}; /* Local functions */ static int mca_oob_xcast_binomial_tree(orte_jobid_t job, @@ -135,7 +135,7 @@ int mca_oob_xcast_nb(orte_jobid_t job, gettimeofday(&stop, NULL); opal_output(0, "xcast_nb [%ld,%ld,%ld]: mode %s time %ld usec", ORTE_NAME_ARGS(ORTE_PROC_MY_NAME), (orte_oob_xcast_mode < 0 || orte_oob_xcast_mode > 2) ? - strmode[3] : strmode[orte_oob_xcast_mode], + mode_string[3] : mode_string[orte_oob_xcast_mode], (long int)((stop.tv_sec - start.tv_sec)*1000000 + (stop.tv_usec - start.tv_usec))); } @@ -196,7 +196,7 @@ int mca_oob_xcast(orte_jobid_t job, gettimeofday(&stop, NULL); opal_output(0, "xcast_nb [%ld,%ld,%ld]: mode %s time %ld usec", ORTE_NAME_ARGS(ORTE_PROC_MY_NAME), (orte_oob_xcast_mode < 0 || orte_oob_xcast_mode > 2) ? - strmode[3] : strmode[orte_oob_xcast_mode], + mode_string[3] : mode_string[orte_oob_xcast_mode], (long int)((stop.tv_sec - start.tv_sec)*1000000 + (stop.tv_usec - start.tv_usec))); }