Use ifndef around OS specific headers

Fixes #52

9 files changed, 35 insertions, 0 deletions

diff --git a/cpp/include/IceSSL/SChannel.h b/cpp/include/IceSSL/SChannel.h
index e6af5af566f..3c5908bb8b4 100644
--- a/cpp/include/IceSSL/SChannel.h
+++ b/cpp/include/IceSSL/SChannel.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SCHANNEL_H
 #define ICESSL_SCHANNEL_H
 
+#ifdef _WIN32
+
 #include <IceSSL/Plugin.h>
 
 #include <wincrypt.h>
@@ -71,3 +73,5 @@ public:
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff --git a/cpp/include/IceSSL/SecureTransport.h b/cpp/include/IceSSL/SecureTransport.h
index 42d3c54ed42..a13b0a312f6 100644
--- a/cpp/include/IceSSL/SecureTransport.h
+++ b/cpp/include/IceSSL/SecureTransport.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SECURE_TRANSPORT_H
 #define ICESSL_SECURE_TRANSPORT_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/Plugin.h>
 #include <Security/Security.h>
 
@@ -71,3 +73,5 @@ public:
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff --git a/cpp/src/IceSSL/SChannelEngine.h b/cpp/src/IceSSL/SChannelEngine.h
index 732effb4430..a4ac9ff982f 100644
--- a/cpp/src/IceSSL/SChannelEngine.h
+++ b/cpp/src/IceSSL/SChannelEngine.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SCHANNEL_ENGINE_H
 #define ICESSL_SCHANNEL_ENGINE_H
 
+#ifdef _WIN32
+
 #include <IceSSL/SSLEngine.h>
 #include <IceSSL/SChannelEngineF.h>
 
@@ -124,3 +126,5 @@ private:
 }
 
 #endif
+
+#endif
diff --git a/cpp/src/IceSSL/SChannelEngineF.h b/cpp/src/IceSSL/SChannelEngineF.h
index 718d675d0a8..62dbea589e7 100644
--- a/cpp/src/IceSSL/SChannelEngineF.h
+++ b/cpp/src/IceSSL/SChannelEngineF.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SCHANNEL_ENGINE_F_H
 #define ICESSL_SCHANNEL_ENGINE_F_H
 
+#ifdef _WIN32
+
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
 
@@ -30,3 +32,5 @@ typedef IceInternal::Handle<SSLEngine> SSLEnginePtr;
 }
 
 #endif
+
+#endif
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index e08db4028cc..695c65495f5 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SCHANNELTRANSCEIVER_I_H
 #define ICESSL_SCHANNELTRANSCEIVER_I_H
 
+#ifdef _WIN32
+
 #include <IceSSL/Config.h>
 #include <IceSSL/InstanceF.h>
 #include <IceSSL/Plugin.h>
@@ -129,3 +131,5 @@ typedef IceUtil::Handle<TransceiverI> TransceiverIPtr;
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff --git a/cpp/src/IceSSL/SecureTransportEngine.h b/cpp/src/IceSSL/SecureTransportEngine.h
index c10947b246a..68901427c7a 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.h
+++ b/cpp/src/IceSSL/SecureTransportEngine.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SECURE_TRANSPORT_ENGINE_H
 #define ICESSL_SECURE_TRANSPORT_ENGINE_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/SSLEngine.h>
 #include <Ice/UniqueRef.h>
 
@@ -58,3 +60,5 @@ private:
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff --git a/cpp/src/IceSSL/SecureTransportEngineF.h b/cpp/src/IceSSL/SecureTransportEngineF.h
index 3a68f1c3f80..aa91b1ba6b4 100644
--- a/cpp/src/IceSSL/SecureTransportEngineF.h
+++ b/cpp/src/IceSSL/SecureTransportEngineF.h
@@ -10,6 +10,7 @@
 #ifndef ICESSL_SECURE_TRANSPORT_ENGINE_F_H
 #define ICESSL_SECURE_TRANSPORT_ENGINE_F_H
 
+#ifdef __APPLE__
 #include <IceSSL/Plugin.h>
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
@@ -29,3 +30,5 @@ typedef IceInternal::Handle<SSLEngine> SSLEnginePtr;
 }
 
 #endif
+
+#endif
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.h b/cpp/src/IceSSL/SecureTransportTransceiverI.h
index 7277ae95765..9eeae288f51 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.h
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
 #define ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/Config.h>
 #include <IceSSL/InstanceF.h>
 #include <IceSSL/SecureTransportEngineF.h>
@@ -90,3 +92,5 @@ typedef IceUtil::Handle<TransceiverI> TransceiverIPtr;
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff --git a/cpp/src/IceSSL/SecureTransportUtil.h b/cpp/src/IceSSL/SecureTransportUtil.h
index f286765e813..7d39f322f48 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.h
+++ b/cpp/src/IceSSL/SecureTransportUtil.h
@@ -10,6 +10,8 @@
 #ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
 #define ICESSL_SECURE_TRANSPORT_UTIL_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/SecureTransport.h>
 #include <IceSSL/Util.h>
 
@@ -44,3 +46,5 @@ CFArrayRef findCertificateChain(const std::string&, const std::string&, const st
 } // IceSSL namespace end
 
 #endif
+
+#endif