Cleanup the OMPI_DECLSPEC/OMPI_MODULE_DECLSPEC in the PMLs.

This commit was SVN r17093.

ompi/mca/pml/cm/pml_cm.h

@@ -28,7 +28,7 @@
 
 BEGIN_C_DECLS
 
-OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_cm_component;
+OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_cm_component;
 
 struct mca_mtl_request_t;
 
@@ -36,7 +36,7 @@ struct mca_mtl_request_t;
  * These are called internally by the library when the send 
  * is completed from its perspective. 
  */
-OMPI_DECLSPEC extern void (*send_completion_callbacks[])    
+extern void (*send_completion_callbacks[])    
     (struct mca_mtl_request_t *mtl_request);
 
 struct ompi_pml_cm_t {

ompi/mca/pml/cm/pml_cm_recvreq.h

@@ -28,7 +28,7 @@ struct mca_pml_cm_thin_recv_request_t {
     mca_mtl_request_t req_mtl;            /**< the mtl specific memory. This field should be the last in the struct */
 };
 typedef struct mca_pml_cm_thin_recv_request_t mca_pml_cm_thin_recv_request_t;
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_thin_recv_request_t);
+OBJ_CLASS_DECLARATION(mca_pml_cm_thin_recv_request_t);
 
 struct mca_pml_cm_hvy_recv_request_t {
     mca_pml_cm_request_t req_base;
@@ -43,7 +43,7 @@ struct mca_pml_cm_hvy_recv_request_t {
 }; 
 typedef struct mca_pml_cm_hvy_recv_request_t mca_pml_cm_hvy_recv_request_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_recv_request_t);
+OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_recv_request_t);
 
 /**
  *  Allocate a recv request from the modules free list.

ompi/mca/pml/cm/pml_cm_request.h

@@ -51,6 +51,6 @@ struct mca_pml_cm_request_t {
 /* END: These fields have to match the definition of the mca_pml_base_request_t */
 };
 typedef struct mca_pml_cm_request_t mca_pml_cm_request_t;
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_request_t);
+OBJ_CLASS_DECLARATION(mca_pml_cm_request_t);
 
 #endif

ompi/mca/pml/cm/pml_cm_sendreq.h

@@ -31,7 +31,7 @@ struct mca_pml_cm_send_request_t {
     mca_pml_base_send_mode_t req_send_mode;
 };
 typedef struct mca_pml_cm_send_request_t mca_pml_cm_send_request_t;
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_send_request_t);
+OBJ_CLASS_DECLARATION(mca_pml_cm_send_request_t);
 
 
 struct mca_pml_cm_thin_send_request_t { 
@@ -39,7 +39,7 @@ struct mca_pml_cm_thin_send_request_t {
     mca_mtl_request_t req_mtl;            /**< the mtl specific memory. This field should be the last in the struct */
 };
 typedef struct mca_pml_cm_thin_send_request_t mca_pml_cm_thin_send_request_t;
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_thin_send_request_t);
+OBJ_CLASS_DECLARATION(mca_pml_cm_thin_send_request_t);
 
 
 struct mca_pml_cm_hvy_send_request_t {
@@ -53,7 +53,7 @@ struct mca_pml_cm_hvy_send_request_t {
     mca_mtl_request_t req_mtl;            /**< the mtl specific memory. This field should be the last in the struct */
 };
 typedef struct mca_pml_cm_hvy_send_request_t mca_pml_cm_hvy_send_request_t;
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_send_request_t);
+OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_send_request_t);
 
 
 #define MCA_PML_CM_THIN_SEND_REQUEST_ALLOC(sendreq, comm, dst,          \

ompi/mca/pml/dr/pml_dr_comm.h

@@ -70,7 +70,7 @@ struct mca_pml_comm_t {
 };
 typedef struct mca_pml_comm_t mca_pml_dr_comm_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_dr_comm_t);
+OBJ_CLASS_DECLARATION(mca_pml_dr_comm_t);
 
 
 /**
@@ -81,7 +81,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_dr_comm_t);
  * @return           OMPI_SUCCESS or error status on failure.
  */
 
-OMPI_DECLSPEC extern int mca_pml_dr_comm_init(mca_pml_dr_comm_t* dr_comm, ompi_communicator_t* ompi_comm);
+extern int mca_pml_dr_comm_init(mca_pml_dr_comm_t* dr_comm, ompi_communicator_t* ompi_comm);
 
 
 #if defined(c_plusplus) || defined(__cplusplus)

ompi/mca/pml/dr/pml_dr_component.h

@@ -27,7 +27,7 @@ extern "C" {
 /*
  * PML module functions.
  */
-OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_dr_component;
+OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_dr_component;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }

ompi/mca/pml/dr/pml_dr_recvfrag.h

@@ -144,11 +144,10 @@ void mca_pml_dr_recv_frag_ack(
  *  Callback from BTL on receipt of a recv_frag.
  */
 
-OMPI_DECLSPEC void mca_pml_dr_recv_frag_callback(
+void mca_pml_dr_recv_frag_callback( mca_btl_base_module_t *btl, 
-    mca_btl_base_module_t *btl, 
+                                    mca_btl_base_tag_t tag,
-    mca_btl_base_tag_t tag,
+                                    mca_btl_base_descriptor_t* descriptor,
-    mca_btl_base_descriptor_t* descriptor,
+                                    void* cbdata);
-    void* cbdata);
 
 /**
  * Match incoming recv_frags against posted receives.  
@@ -160,13 +159,12 @@ OMPI_DECLSPEC void mca_pml_dr_recv_frag_callback(
  * @param additional_matches (OUT)  List of additional matches 
  * @return                          OMPI_SUCCESS or error status on failure.
  */
-OMPI_DECLSPEC bool mca_pml_dr_recv_frag_match(
+bool mca_pml_dr_recv_frag_match( mca_pml_dr_comm_t* comm,
-    mca_pml_dr_comm_t* comm,
+                                 mca_pml_dr_comm_proc_t* proc,
-    mca_pml_dr_comm_proc_t* proc,
+                                 mca_btl_base_module_t* btl, 
-    mca_btl_base_module_t* btl, 
+                                 mca_pml_dr_match_hdr_t *hdr,
-    mca_pml_dr_match_hdr_t *hdr,
+                                 mca_btl_base_segment_t* segments,
-    mca_btl_base_segment_t* segments,
+                                 size_t num_segments);
-    size_t num_segments);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }

ompi/mca/pml/ob1/pml_ob1_component.h

@@ -27,7 +27,7 @@ extern "C" {
 /*
  * PML module functions.
  */
-OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_ob1_component;
+OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_ob1_component;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }

ompi/mca/pml/v/pml_v.h

@@ -26,7 +26,7 @@ struct mca_pml_v_t {
 };
 typedef struct mca_pml_v_t mca_pml_v_t;
 
-OMPI_DECLSPEC extern mca_pml_v_t mca_pml_v;
+OMPI_MODULE_DECLSPEC extern mca_pml_v_t mca_pml_v;
 OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_v_component;
 
 END_C_DECLS