More fixes from directory reorg

This commit was SVN r886.

src/runtime/mpi_runtime.h

@@ -1,31 +0,0 @@
-/*
- * $HEADER$
- */
-
-#ifndef LAM_MPI_INIT_H
-#define LAM_MPI_INIT_H
-
-/*
- * Run-time functions for the MPI layer
- */
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-  int lam_mpi_init(int argc, char **argv, int requested, int *provided);
-  int lam_mpi_finalize(void);
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
-
-/*
- * Global variables and symbols for the MPI layer
- */
-
-extern bool lam_mpi_initialized;
-extern bool lam_mpi_finalized;
-
-extern bool lam_mpi_thread_multiple;
-extern int lam_mpi_thread_requested;
-extern int lam_mpi_thread_provided;
-
-#endif /* LAM_MPI_INIT_H */

src/runtime/runtime.h

@@ -8,6 +8,18 @@
 #include "lam_config.h"
 
 
+/*
+ * Global variables and symbols for the MPI layer
+ */
+
+extern bool lam_mpi_initialized;
+extern bool lam_mpi_finalized;
+
+extern bool lam_mpi_thread_multiple;
+extern int lam_mpi_thread_requested;
+extern int lam_mpi_thread_provided;
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -18,6 +30,9 @@ extern "C" {
   int lam_rte_init(bool *allow_multi_user_threads, bool *have_hidden_threads);
   int lam_rte_finalize(void);
 
+  int lam_mpi_init(int argc, char **argv, int requested, int *provided);
+  int lam_mpi_finalize(void);
+
 #ifdef __cplusplus
 }
 #endif