diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/include/IceSSL/IceSSL.h | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'cpp/include/IceSSL/IceSSL.h')
| -rw-r--r-- | cpp/include/IceSSL/IceSSL.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h index 34be76d838d..8ffa97c6618 100644 --- a/cpp/include/IceSSL/IceSSL.h +++ b/cpp/include/IceSSL/IceSSL.h @@ -10,7 +10,10 @@ #ifndef ICE_SSL_ICE_SSL_H #define ICE_SSL_ICE_SSL_H -#include <IceSSL/Plugin.h> +#include <IceUtil/Config.h> +#ifndef ICE_OS_WINRT +# include <IceSSL/Plugin.h> +#endif #include <IceSSL/EndpointInfo.h> #include <IceSSL/ConnectionInfo.h> |