Remove unused includes. Ensure that the error log is at least always available as we otherwise segfault when reporting errors that occur prior to opening the errmgr framework

This commit was SVN r25288.

orte/mca/errmgr/base/errmgr_base_fns.c

@@ -55,7 +55,6 @@
 #include "opal/util/argv.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
-#include "opal/util/opal_sos.h"
 
 #include "orte/util/name_fns.h"
 #include "orte/util/session_dir.h"

orte/mca/errmgr/base/errmgr_base_open.c

@@ -70,7 +70,23 @@ orte_errmgr_base_module_t orte_errmgr_default_fns = {
     NULL, /* ft_event            */
     orte_errmgr_base_register_migration_warning
 };
-orte_errmgr_base_module_t orte_errmgr;
+/* NOTE: ABSOLUTELY MUST initialize this
+ * struct to include the log function as it
+ * gets called even if the errmgr hasn't been
+ * opened yet due to error
+ */
+orte_errmgr_base_module_t orte_errmgr = {
+    NULL,
+    NULL,
+    orte_errmgr_base_log,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
 
 /**
  * Function for finding and opening either all MCA components, or the one

orte/mca/errmgr/errmgr.h

@@ -52,7 +52,6 @@
 #include "opal/class/opal_pointer_array.h"
 #include "opal/util/output.h"
 #include "opal/util/error.h"
-#include "opal/util/opal_sos.h"
 
 #include "orte/runtime/orte_globals.h"
 #include "orte/mca/plm/plm_types.h"
@@ -149,11 +148,7 @@ OBJ_CLASS_DECLARATION(orte_errmgr_predicted_map_t);
 
 #define ORTE_ERROR_NAME(n)  opal_strerror(n)
 #define ORTE_ERROR_LOG(n)                       \
-    if (true == OPAL_SOS_IS_NATIVE(n)) {        \
-        orte_errmgr.log(n, __FILE__, __LINE__); \
-    } else {                                    \
-        OPAL_SOS_LOG(n);                        \
-    }
+        orte_errmgr.log(n, __FILE__, __LINE__);
 
 
 /*