From 7baae4f394d18837b19d688c207e4838c2778513 Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Sat, 10 Dec 2005 22:04:28 +0000
Subject: [PATCH] Protect the headers and remove the unused ones.

This commit was SVN r8439.
---
 ompi/mca/btl/self/btl_self.h           |  8 ++++----
 ompi/mca/btl/self/btl_self_component.c | 10 ++++++----
 ompi/mca/btl/sm/btl_sm.h               |  8 ++++++--
 ompi/mca/btl/sm/btl_sm_component.c     | 12 ++++++++++++
 ompi/mca/btl/tcp/btl_tcp_component.c   |  4 ++--
 ompi/mca/btl/tcp/btl_tcp_endpoint.c    |  4 ++++
 ompi/mca/btl/tcp/btl_tcp_frag.c        |  2 ++
 7 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/ompi/mca/btl/self/btl_self.h b/ompi/mca/btl/self/btl_self.h
index 5a46f7bec0..925975d459 100644
--- a/ompi/mca/btl/self/btl_self.h
+++ b/ompi/mca/btl/self/btl_self.h
@@ -21,12 +21,12 @@
 #ifndef MCA_BTL_SELF_H
 #define MCA_BTL_SELF_H
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif  /* HAVE_STDLIB_H */
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#include <sys/socket.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
+#endif  /* HAVE_SYS_TYPES_H */
 #include "class/ompi_free_list.h"
 #include "class/ompi_bitmap.h"
 #include "class/ompi_fifo.h"
diff --git a/ompi/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c
index 0751b3e91b..1fcbdccd70 100644
--- a/ompi/mca/btl/self/btl_self_component.c
+++ b/ompi/mca/btl/self/btl_self_component.c
@@ -16,13 +16,15 @@
  * $HEADER$
  */
 #include "ompi_config.h"
-#include <errno.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif  /* HAVE_UNISTD_H */
+#ifdef HAVE_STRING_H
 #include <string.h>
-#include <fcntl.h>
+#endif  /* HAVE_STRING_H */
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>  /* for mkfifo */
+#endif  /* HAVE_SYS_TYPES_H */
 
 #include "ompi/include/constants.h"
 #include "include/sys/cache.h"
diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h
index 54fd3fea95..6dcf953bd0 100644
--- a/ompi/mca/btl/sm/btl_sm.h
+++ b/ompi/mca/btl/sm/btl_sm.h
@@ -23,14 +23,18 @@
 #define MCA_BTL_SM_H
 
 #include <stdlib.h>
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif  /* HAVE_SYS_TYPES_H */
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif  /* HAVE_SYS_SOCKET_H */
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#endif
+#endif  /* HAVE_NETINET_IN_H */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#endif  /* HAVE_UNISTD_H */
 #include "class/ompi_free_list.h"
 #include "class/ompi_bitmap.h"
 #include "class/ompi_fifo.h"
diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c
index 9f6cf462fa..a731161f1c 100644
--- a/ompi/mca/btl/sm/btl_sm_component.c
+++ b/ompi/mca/btl/sm/btl_sm_component.c
@@ -17,12 +17,24 @@
  */
 #include "ompi_config.h"
 #include <errno.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif  /* HAVE_UNISTD_H */
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif  /* HAVE_STRING_H */
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif  /* HAVE_FCNTL_H */
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif  /* HAVE_SYS_TYPES_H */
+#ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
+#endif  /* HAVE_SYS_MMAN_H */
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>  /* for mkfifo */
+#endif  /* HAVE_SYS_STAT_H */
 
 #include "ompi/include/constants.h"
 #include "include/sys/cache.h"
diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c
index 6aae3abea2..e3b1fba4e7 100644
--- a/ompi/mca/btl/tcp/btl_tcp_component.c
+++ b/ompi/mca/btl/tcp/btl_tcp_component.c
@@ -170,7 +170,7 @@ static void mca_btl_tcp_component_recv_handler(int, short, void*);
 
 int mca_btl_tcp_component_open(void)
 {
-#ifdef WIN32
+#ifdef __WINDOWS__
     WSADATA win_sock_data;
     if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) {
         BTL_ERROR(("failed to initialise windows sockets:%d", WSAGetLastError()));
@@ -234,7 +234,7 @@ int mca_btl_tcp_component_open(void)
 int mca_btl_tcp_component_close(void)
 {
     opal_list_item_t* item;
-#ifdef WIN32
+#ifdef __WINDOWS__
     WSACleanup();
 #endif
 
diff --git a/ompi/mca/btl/tcp/btl_tcp_endpoint.c b/ompi/mca/btl/tcp/btl_tcp_endpoint.c
index c5140dc7d0..0a56dad24e 100644
--- a/ompi/mca/btl/tcp/btl_tcp_endpoint.c
+++ b/ompi/mca/btl/tcp/btl_tcp_endpoint.c
@@ -39,8 +39,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif  /* HAVE_SYS_TIME_H */
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif  /* HAVE_TIME_H */
 #include "include/types.h"
 #include "mca/ns/base/base.h"
 #include "mca/oob/base/base.h"
diff --git a/ompi/mca/btl/tcp/btl_tcp_frag.c b/ompi/mca/btl/tcp/btl_tcp_frag.c
index e2753b92a8..b02f24b041 100644
--- a/ompi/mca/btl/tcp/btl_tcp_frag.c
+++ b/ompi/mca/btl/tcp/btl_tcp_frag.c
@@ -6,7 +6,9 @@
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif  /* HAVE_UNISTD_H */
 
 #include "include/ompi_socket_errno.h"
 #include "ompi/mca/btl/base/btl_base_error.h"