Use BEGIN_C_DECLS and END_C_DECLS instead of the ugly #if/#endif.

This commit was SVN r17009.

ompi/mca/pml/base/pml_base_recvreq.h

@@ -26,9 +26,7 @@
 #include "ompi/datatype/convertor.h"
 #include "ompi/peruse/peruse-internal.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
+BEGIN_C_DECLS
 
 /**
  * Base type for receive requests.
@@ -118,8 +116,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_base_recv_request_t);
         ompi_convertor_cleanup( &((request)->req_base.req_convertor) ); \
     } while (0)
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
+END_C_DECLS
+
 #endif
 

ompi/mca/pml/base/pml_base_request.h

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -25,9 +26,7 @@
 #include "ompi/request/request.h"
 #include "ompi/datatype/convertor.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
+BEGIN_C_DECLS
 
 /**
  * External list for the requests. They are declared as lists of
@@ -76,8 +75,7 @@ typedef struct mca_pml_base_request_t mca_pml_base_request_t;
 
 OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_base_request_t);
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
+END_C_DECLS
+
 #endif
 

ompi/mca/pml/base/pml_base_sendreq.h

@@ -29,9 +29,7 @@
 #include "ompi/datatype/convertor.h"
 #include "ompi/peruse/peruse-internal.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
+BEGIN_C_DECLS
 
 /**
  * Base type for send requests 
@@ -139,8 +137,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION( mca_pml_base_send_request_t );
     } while (0)
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
+END_C_DECLS
+
 #endif
 

ompi/mca/pml/ob1/pml_ob1_recvreq.h

@@ -30,10 +30,7 @@
 #include "ompi/mca/pml/base/pml_base_recvreq.h"
 #include "ompi/datatype/datatype.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-
+BEGIN_C_DECLS
 
 struct mca_pml_ob1_recv_request_t {
     mca_pml_base_recv_request_t req_recv;
@@ -382,8 +379,7 @@ int mca_pml_ob1_recv_request_get_frag(mca_pml_ob1_rdma_frag_t* frag);
  * operation cannot be accomplished for some reason. */
 void mca_pml_ob1_recv_request_process_pending(void);
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
+END_C_DECLS
+
 #endif