From 7c9bae5eb75b9269bc92db3119a46a532e913f23 Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Wed, 6 Jun 2007 16:25:18 +0000
Subject: [PATCH] need to protect these includes as well...

This commit was SVN r14912.
---
 ompi/mpi/cxx/mpicxx.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ompi/mpi/cxx/mpicxx.h b/ompi/mpi/cxx/mpicxx.h
index 2228397ad0..db296eb66a 100644
--- a/ompi/mpi/cxx/mpicxx.h
+++ b/ompi/mpi/cxx/mpicxx.h
@@ -159,9 +159,15 @@ namespace MPI {
   typedef MPI_Aint Aint;
   typedef MPI_Offset Offset;
 
+#ifdef OMPI_BUILDING_CXX_BINDINGS_LIBRARY
 #include "ompi/mpi/cxx/constants.h"
 #include "ompi/mpi/cxx/functions.h"
 #include "ompi/mpi/cxx/datatype.h"
+#else
+#include "openmpi/ompi/mpi/cxx/constants.h"
+#include "openmpi/ompi/mpi/cxx/functions.h"
+#include "openmpi/ompi/mpi/cxx/datatype.h"
+#endif
 
   typedef void User_function(const void* invec, void* inoutvec, int len,
 			     const Datatype& datatype);