From 350d989c009c8dee3cd9d230d68ea4be27ba7118 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 10 Jan 2014 17:20:49 +0000
Subject: [PATCH] Fix OpenBSD warnings where <malloc.h> is available and
 usable, but not intended to be used and emits a compile-time warning.

Thanks to Paul Hargrove for identifying the issue.

cmr=v1.7.4:reviewer=hjelmn:subject=remove/replace malloc.h

This commit was SVN r30231.
---
 ompi/mca/mpool/base/mpool_base_frame.c       | 5 +----
 ompi/mca/mpool/base/mpool_base_lookup.c      | 5 +----
 ompi/mca/mpool/grdma/mpool_grdma_component.c | 7 ++-----
 ompi/mca/mpool/grdma/mpool_grdma_module.c    | 6 ++----
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/ompi/mca/mpool/base/mpool_base_frame.c b/ompi/mca/mpool/base/mpool_base_frame.c
index fe127b00ac..e9b14ffd98 100644
--- a/ompi/mca/mpool/base/mpool_base_frame.c
+++ b/ompi/mca/mpool/base/mpool_base_frame.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      NVIDIA Corporation.  All rights reserved.
  * $COPYRIGHT$
  * 
@@ -25,9 +25,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h> 
 #endif  /* HAVE_UNISTD_H */
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
diff --git a/ompi/mca/mpool/base/mpool_base_lookup.c b/ompi/mca/mpool/base/mpool_base_lookup.c
index aa55ba68a6..8c00c22484 100644
--- a/ompi/mca/mpool/base/mpool_base_lookup.c
+++ b/ompi/mca/mpool/base/mpool_base_lookup.c
@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006-2007 Mellanox Technologies. All rights reserved.
- * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights reserved.
  * $COPYRIGHT$
  * 
@@ -25,9 +25,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
diff --git a/ompi/mca/mpool/grdma/mpool_grdma_component.c b/ompi/mca/mpool/grdma/mpool_grdma_component.c
index d936d2bf14..2dbc34c001 100644
--- a/ompi/mca/mpool/grdma/mpool_grdma_component.c
+++ b/ompi/mca/mpool/grdma/mpool_grdma_component.c
@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006      Voltaire. All rights reserved.
- * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
  *
@@ -30,10 +30,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
+#include <stdlib.h>
 #include <fcntl.h>
 
 /*
diff --git a/ompi/mca/mpool/grdma/mpool_grdma_module.c b/ompi/mca/mpool/grdma/mpool_grdma_module.c
index 437d815caf..d9d13a508e 100644
--- a/ompi/mca/mpool/grdma/mpool_grdma_module.c
+++ b/ompi/mca/mpool/grdma/mpool_grdma_module.c
@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006      Voltaire. All rights reserved.
  * Copyright (c) 2007      Mellanox Technologies. All rights reserved.
  * Copyright (c) 2010      IBM Corporation.  All rights reserved.
@@ -30,9 +30,7 @@
 
 #include <errno.h>
 #include <string.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
 #include "opal/align.h"