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

@@ -20,7 +20,6 @@
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "ompi_config.h"
-#include <sched.h>
 #include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
 #include "mca/btl/btl.h"

ompi/mca/pml/ob1/pml_ob1_rdma.c

@@ -20,7 +20,6 @@
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "ompi_config.h"
-#include <sched.h>
 #include "ompi/include/constants.h"
 #include "orte/util/proc_info.h"
 #include "mca/pml/pml.h"

ompi/mca/pml/ob1/pml_ob1_sendreq.c

@@ -20,7 +20,9 @@
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "ompi_config.h"
+#ifdef HAVE_SCHED_H
 #include <sched.h>
+#endif  /* HAVE_SCHED_H */
 #include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
 #include "mca/btl/btl.h"

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) {

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);
@@ -121,10 +114,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 !=
         mca_pml_uniq.uniq_recv_requests.super.opal_list_length) {