From b82f062f24f305c1eb1f554933585d6b939ca5f7 Mon Sep 17 00:00:00 2001
From: Shiqing Fan <shiqing@hlrs.de>
Date: Wed, 27 Aug 2008 15:49:40 +0000
Subject: [PATCH] - double declaration of extern "C" make MS compiler complain.
 Change them to *_C_DECLS.

This commit was SVN r19432.
---
 ompi/op/op_predefined.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ompi/op/op_predefined.h b/ompi/op/op_predefined.h
index 7b0e691efa..00de23661c 100644
--- a/ompi/op/op_predefined.h
+++ b/ompi/op/op_predefined.h
@@ -193,9 +193,7 @@
   void ompi_mpi_op_##name##_short_int OMPI_OP_PROTO; \
   void ompi_mpi_op_##name##_long_double_int OMPI_OP_PROTO;
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
+BEGIN_C_DECLS
 
 /**
  * Handler functions for MPI_MAX
@@ -449,10 +447,6 @@ extern "C" {
   void ompi_mpi_op_three_buff_##name##_short_int OMPI_OP_PROTO_3BUF; \
   void ompi_mpi_op_three_buff_##name##_long_double_int OMPI_OP_PROTO_3BUF;
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-
 /**
  * Handler functions for MPI_MAX
  */
@@ -532,8 +526,6 @@ extern "C" {
  */
   OMPI_OP_3BUFF_HANDLER_2TYPE(minloc)
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
+END_C_DECLS
 
 #endif /* OMPI_OP_PREDEFINED_H */