Fix a couple of compiler warnings (errors?) caught by ICC testing at Cisco.

This commit was SVN r14080.

ompi/mca/crcp/crcp.h

@@ -45,6 +45,10 @@
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
 /**
  * Query function for CRCP components.
  * Returns a priority to rank it agaianst other available CRCP components.
@@ -369,4 +373,8 @@ OMPI_DECLSPEC extern ompi_crcp_base_module_t ompi_crcp;
 #define OMPI_CRCP_REQUEST_COMPLETE(req) ;
 #endif
 
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
 #endif /* OMPI_CRCP_H */

orte/mca/filem/filem.h

@@ -35,6 +35,10 @@
 
 #include "opal/class/opal_object.h"
 
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
 /**
  * A set of flags that determine the type of the file
  * in question
@@ -206,5 +210,9 @@ ORTE_DECLSPEC extern orte_filem_base_module_t orte_filem;
     /* FILEM v1.0 */ \
     "filem", 1, 0, 0
 
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
 #endif /* ORTE_FILEM_H */
 

orte/mca/snapc/snapc.h

@@ -85,6 +85,10 @@
 
 #include "opal/class/opal_object.h"
 
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
 /**
  * Three types of Coordinator types, plus
  *  the case when it hasn't been defined.
@@ -261,5 +265,9 @@ ORTE_DECLSPEC extern orte_snapc_base_module_t orte_snapc;
     /* SNAPC v1.0 */ \
     "snapc", 1, 0, 0
 
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
 #endif /* ORTE_SNAPC_H */