Be more generic with the Windows support.

This commit was SVN r14185.

opal/include/opal/types.h

@@ -66,7 +66,6 @@ typedef struct ompi_fd_set_t ompi_fd_set_t;
 #define OMPI_FD_ISSET(fd,fds) FD_ISSET((fd),(fd_set*)(fds))
 
 #else /* if we are on windows */
-#include <Winsock2.h>    
 typedef fd_set ompi_fd_set_t;
 #define OMPI_FD_ZERO(fds)     FD_ZERO((fds))
 #define OMPI_FD_SET(fd,fds)   FD_SET((fd),(fds))

opal/include/opal_config_bottom.h

@@ -215,9 +215,7 @@
 #    endif  /* defined(OPAL_IMPORTS) */
 #    define OPAL_MODULE_DECLSPEC
 #  endif  /* defined(_USRDLL) */
-#  if OMPI_BUILDING
+#  include "opal/win32/win_compat.h"
-#    include "opal/win32/win_compat.h"
-#  endif  /* OMPI_BUILDING */
 #else
    /* On Unix - this define is plain useless */
 #  define OPAL_DECLSPEC