Revert "Update to sync with OMPI master and cleanup to build"

This reverts commit cb55c88a8b.

ompi/mpi/c/comm_create_errhandler.c

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+#include "ompi_config.h"
+#include <stdio.h>
+
+#include "ompi/mpi/c/bindings.h"
+#include "ompi/runtime/params.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/errhandler/errhandler.h"
+
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
+#pragma weak MPI_Comm_create_errhandler = PMPI_Comm_create_errhandler
+#endif
+#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler
+#endif
+
+
+static const char FUNC_NAME[] = "MPI_Comm_create_errhandler";
+
+
+int MPI_Comm_create_errhandler(MPI_Comm_errhandler_function *function,
+                               MPI_Errhandler *errhandler)
+{
+  int err = MPI_SUCCESS;
+
+  /* Error checking */
+
+  if (MPI_PARAM_CHECK) {
+    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+
+    if (NULL == function ||
+        NULL == errhandler) {
+      return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
+                                    FUNC_NAME);
+    }
+  }
+
+  OPAL_CR_ENTER_LIBRARY();
+
+  /* Create and cache the errhandler.  Sets a refcount of 1. */
+
+  *errhandler =
+    ompi_errhandler_create(OMPI_ERRHANDLER_TYPE_COMM,
+                           (ompi_errhandler_generic_handler_fn_t*) function,
+                           OMPI_ERRHANDLER_LANG_C);
+  if (NULL == *errhandler) {
+    err = MPI_ERR_INTERN;
+  }
+
+  OMPI_ERRHANDLER_RETURN(err, MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+}