Ensure consistency between ompi and opal callback safety requirement

values.

Signed-off-by: Chris Chambreau <chambreau1@llnl.gov>

Author: cchambreau

ompi/include/mpi.h.in

@@ -922,12 +922,18 @@ enum {
 
 /*
  * MPIT callback safety levels
+ *
+ * Values are set in configure.ac for consistency with mca_base_event.h
  */
+#undef OPAL_MCA_BASE_CB_REQUIRE_NONE
+#undef OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED
+#undef OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE
+#undef OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE
 typedef enum {
-  MPI_T_CB_REQUIRE_NONE,
-  MPI_T_CB_REQUIRE_MPI_RESTRICTED,
-  MPI_T_CB_REQUIRE_THREAD_SAFE,
-  MPI_T_CB_REQUIRE_ASYNC_SIGNAL_SAFE
+    MPI_T_CB_REQUIRE_NONE = OPAL_MCA_BASE_CB_REQUIRE_NONE,
+    MPI_T_CB_REQUIRE_MPI_RESTRICTED = OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED,
+    MPI_T_CB_REQUIRE_THREAD_SAFE = OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE,
+    MPI_T_CB_REQUIRE_ASYNC_SIGNAL_SAFE = OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE
 } MPI_T_cb_safety;
 
 /*

opal/mca/base/mca_base_event.h

@@ -42,13 +42,13 @@ typedef enum {
 /**
  * @basic Callback safety levels
  *
- * If these are modified then similar modifications will be needed in mpi.h.in.
+ * Values are set in configure.ac for consistency with mpi.h
  */
 typedef enum {
-    MCA_BASE_CB_REQUIRE_NONE,
-    MCA_BASE_CB_REQUIRE_MPI_RESTRICTED,
-    MCA_BASE_CB_REQUIRE_THREAD_SAFE,
-    MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
+    MCA_BASE_CB_REQUIRE_NONE = OPAL_MCA_BASE_CB_REQUIRE_NONE,
+    MCA_BASE_CB_REQUIRE_MPI_RESTRICTED = OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED,
+    MCA_BASE_CB_REQUIRE_THREAD_SAFE = OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE,
+    MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE = OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
     MCA_BASE_CB_SAFETY_MAX,
 } mca_base_cb_safety_t;