Fix a few more rogue global symbols

This commit was SVN r2820.

src/mca/pcm/rsh/pcm_rsh_spawn.c

@@ -338,19 +338,19 @@ internal_spawn_proc(mca_pcm_rsh_module_t *me,
     ompi_argv_append(&cmdc, &cmdv, BOOTAGENT);
 
     /* starting vpid for launchee's procs */
-    tmp = ltostr(my_start_vpid);
+    tmp = ompi_ltostr(my_start_vpid);
     ompi_argv_append(&cmdc, &cmdv, "--local_offset");
     ompi_argv_append(&cmdc, &cmdv, tmp);
     free(tmp);
 
     /* global starting vpid for this pcm spawn */
-    tmp = ltostr(global_start_vpid);
+    tmp = ompi_ltostr(global_start_vpid);
     ompi_argv_append(&cmdc, &cmdv, "--global_start_vpid");
     ompi_argv_append(&cmdc, &cmdv, tmp);
     free(tmp);
 
     /* number of procs in this pcm spawn */
-    tmp = ltostr(num_procs);
+    tmp = ompi_ltostr(num_procs);
     ompi_argv_append(&cmdc, &cmdv, "--num_procs");
     ompi_argv_append(&cmdc, &cmdv, tmp);
     free(tmp);

src/util/numtostr.c

@@ -10,7 +10,7 @@
 
 
 char*
-ltostr(long num)
+ompi_ltostr(long num)
 {
     /* waste a little bit of space, but always have a big enough buffer */
     int buflen = sizeof(long) * 8;
@@ -31,7 +31,7 @@ ltostr(long num)
 
 
 char*
-dtostr(double num)
+ompi_dtostr(double num)
 {
     /* waste a little bit of space, but always have a big enough buffer */
     int buflen = sizeof(long) * 8;

src/util/numtostr.h

@@ -1,6 +1,9 @@
 /*
  * $HEADER$
  */
+/**
+ * @file
+ */
 
 #ifndef OMPI_NUMTOSTR_UTIL
 #define OMPI_NUMTOSTR_UTIL
@@ -12,7 +15,7 @@
  *  @param num (IN)      Input number
  *  @return              String containing number (NULL on failure)
  */
-char* ltostr(long num);
+char* ompi_ltostr(long num);
 
 
 /**
@@ -22,6 +25,6 @@ char* ltostr(long num);
  * @param num (IN)       Input number
  * @return               String containing number (NULL on failure)
  */
-char* dtostr(double num);
+char* ompi_dtostr(double num);
 
 #endif /* OMPI_NUMTOSTR_UTIL */