Cleanup base functions to compile.

This commit was SVN r1615.

src/mca/ns/base/base.h

@@ -26,6 +26,32 @@ extern "C" {
     int mca_ns_base_select(bool *allow_multi_user_threads,
 			    bool *have_hidden_threads);
     int mca_ns_base_close(void);
+
+/*
+ * Base functions that are common to all implementations - can be overridden
+ */
+
+ompi_process_name_t* ns_base_create_process_name(ompi_process_id_t cell,
+                             ompi_process_id_t job, ompi_process_id_t vpid);
+
+char* ns_base_get_proc_name_string(const ompi_process_name_t* name);
+
+char* ns_base_get_vpid_string(const ompi_process_name_t* name);
+
+char* ns_base_get_jobid_string(const ompi_process_name_t* name);
+
+char* ns_base_get_cellid_string(const ompi_process_name_t* name);
+
+ompi_process_id_t ns_base_get_vpid(const ompi_process_name_t* name);
+
+ompi_process_id_t ns_base_get_jobid(const ompi_process_name_t* name);
+
+ompi_process_id_t ns_base_get_cellid(const ompi_process_name_t* name);
+
+int ns_base_compare(ompi_ns_cmp_bitmask_t fields,
+                    const ompi_process_name_t* name1,
+                    const ompi_process_name_t* name2);
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif

src/mca/ns/base/ns_base_functions.c

@@ -8,7 +8,6 @@
 #include "ompi_config.h"
 #include "mca/mca.h"
 #include "mca/ns/base/base.h"
-#include "ns_replica.h"
 
 /**
  * globals

src/mca/ns/base/ns_base_select.c

@@ -5,6 +5,10 @@
 #include "ompi_config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <types.h>
 
 #include "runtime/runtime.h"
 #include "util/output.h"
@@ -12,6 +16,7 @@
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/ns/base/base.h"
+#include "mca/ns/replica/src/ns_replica.h"
 
 
 /**
@@ -31,8 +36,7 @@ int mca_ns_base_select(bool *allow_multi_user_threads,
      */
 
     if (ompi_process_info.seed) {  /* true if I'm the seed daemon */
-	ompi_name_server = *mca_ns_replica_init(bool *allow_multi_user_threads, 
-						bool *have_hidden_threads);
+	ompi_name_server = *mca_ns_replica_init(allow_multi_user_threads, have_hidden_threads);
     }
 
     return OMPI_SUCCESS;