From c6eb429a9a16b99003d3d4fa469c9ef55f125a4d Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Sat, 10 Dec 2005 21:38:48 +0000 Subject: [PATCH] Wondows work: - remove windows socket initialization (it's already in the TCP component) - protect all used header files - remove the unused ones. This commit was SVN r8434. --- ompi/mca/pml/dr/pml_dr_sendreq.c | 1 - ompi/mca/pml/ob1/pml_ob1_rdma.c | 1 - ompi/mca/pml/ob1/pml_ob1_sendreq.c | 2 ++ ompi/mca/pml/teg/pml_teg_component.c | 11 ----------- ompi/mca/pml/uniq/pml_uniq_component.c | 11 ----------- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/ompi/mca/pml/dr/pml_dr_sendreq.c b/ompi/mca/pml/dr/pml_dr_sendreq.c index 0d29f924c9..a44c568e77 100644 --- a/ompi/mca/pml/dr/pml_dr_sendreq.c +++ b/ompi/mca/pml/dr/pml_dr_sendreq.c @@ -20,7 +20,6 @@ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "ompi_config.h" -#include #include "ompi/include/constants.h" #include "mca/pml/pml.h" #include "mca/btl/btl.h" diff --git a/ompi/mca/pml/ob1/pml_ob1_rdma.c b/ompi/mca/pml/ob1/pml_ob1_rdma.c index e99bd7ae44..535a372178 100644 --- a/ompi/mca/pml/ob1/pml_ob1_rdma.c +++ b/ompi/mca/pml/ob1/pml_ob1_rdma.c @@ -20,7 +20,6 @@ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "ompi_config.h" -#include #include "ompi/include/constants.h" #include "orte/util/proc_info.h" #include "mca/pml/pml.h" diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c index 9d3593b943..0f0653b7ef 100644 --- a/ompi/mca/pml/ob1/pml_ob1_sendreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.c @@ -20,7 +20,9 @@ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ #include "ompi_config.h" +#ifdef HAVE_SCHED_H #include +#endif /* HAVE_SCHED_H */ #include "ompi/include/constants.h" #include "mca/pml/pml.h" #include "mca/btl/btl.h" diff --git a/ompi/mca/pml/teg/pml_teg_component.c b/ompi/mca/pml/teg/pml_teg_component.c index 4dbd94006e..f997930e47 100644 --- a/ompi/mca/pml/teg/pml_teg_component.c +++ b/ompi/mca/pml/teg/pml_teg_component.c @@ -76,13 +76,6 @@ static inline int mca_pml_teg_param_register_int( int mca_pml_teg_component_open(void) { -#ifdef WIN32 - WSADATA win_sock_data; - if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) { - opal_output (0, "failed to initialise windows sockets: %d\n", WSAGetLastError()); - return OMPI_ERROR; - } -#endif OBJ_CONSTRUCT(&mca_pml_teg.teg_lock, opal_mutex_t); OBJ_CONSTRUCT(&mca_pml_teg.teg_send_requests, ompi_free_list_t); OBJ_CONSTRUCT(&mca_pml_teg.teg_recv_requests, ompi_free_list_t); @@ -122,10 +115,6 @@ int mca_pml_teg_component_close(void) if(OMPI_SUCCESS != (rc = mca_ptl_base_close())) return rc; -#ifdef WIN32 - WSACleanup(); -#endif - #if OMPI_ENABLE_DEBUG if (mca_pml_teg.teg_recv_requests.fl_num_allocated != mca_pml_teg.teg_recv_requests.super.opal_list_length) { diff --git a/ompi/mca/pml/uniq/pml_uniq_component.c b/ompi/mca/pml/uniq/pml_uniq_component.c index 43cd49f2cd..9a22430e03 100644 --- a/ompi/mca/pml/uniq/pml_uniq_component.c +++ b/ompi/mca/pml/uniq/pml_uniq_component.c @@ -76,13 +76,6 @@ static inline int mca_pml_uniq_param_register_int( int mca_pml_uniq_component_open(void) { -#ifdef WIN32 - WSADATA win_sock_data; - if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) { - opal_output (0, "failed to initialise windows sockets: %d\n", WSAGetLastError()); - return OMPI_ERROR; - } -#endif OBJ_CONSTRUCT(&mca_pml_uniq.uniq_lock, opal_mutex_t); OBJ_CONSTRUCT(&mca_pml_uniq.uniq_send_requests, ompi_free_list_t); OBJ_CONSTRUCT(&mca_pml_uniq.uniq_recv_requests, ompi_free_list_t); @@ -120,10 +113,6 @@ int mca_pml_uniq_component_close(void) if( OMPI_SUCCESS != (rc = mca_ptl_base_close()) ) return rc; - -#ifdef WIN32 - WSACleanup(); -#endif #if OMPI_ENABLE_DEBUG if (mca_pml_uniq.uniq_recv_requests.fl_num_allocated !=