From b86076859d5c09a57437cd6dd9cdfad7eae3a301 Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Wed, 14 Jul 2004 18:01:21 +0000
Subject: [PATCH] * fixes to maek sure we don't activate memory debugging in
 ompi_config.h

This commit was SVN r1717.
---
 src/mpi/cxx/comm.cc  | 3 ++-
 src/mpi/cxx/mpicxx.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mpi/cxx/comm.cc b/src/mpi/cxx/comm.cc
index eac18956c3..e9f6cf62f8 100644
--- a/src/mpi/cxx/comm.cc
+++ b/src/mpi/cxx/comm.cc
@@ -3,7 +3,8 @@
 // $HEADER$
 //
 
-#include "ompi_config.h"
+// do not include ompi_config.h because it kills the free/malloc defines
+#include "mpi.h"
 #include "mpi/cxx/mpicxx.h"
 #include "threads/mutex.h"
 
diff --git a/src/mpi/cxx/mpicxx.h b/src/mpi/cxx/mpicxx.h
index bb42956e4f..359950a878 100644
--- a/src/mpi/cxx/mpicxx.h
+++ b/src/mpi/cxx/mpicxx.h
@@ -13,7 +13,7 @@
 
 #if defined(__cplusplus) || defined(c_plusplus) 
 
-#include "ompi_config.h"
+// do not include ompi_config.h.  it will smash free() as a symbol
 #include <mpi.h>
 
 // we include all this here so that we escape the silly namespacing issues