diff options
| author | Jose <jose@zeroc.com> | 2015-05-12 23:18:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-05-12 23:18:53 +0200 |
| commit | 2637ae1268bd475ca6298c6893ab0e244378b5eb (patch) | |
| tree | be40fdf25c6fe6ce4a88fe478a8886abad37a1d7 | |
| parent | WinRT install fixes (diff) | |
| download | ice-2637ae1268bd475ca6298c6893ab0e244378b5eb.tar.bz2 ice-2637ae1268bd475ca6298c6893ab0e244378b5eb.tar.xz ice-2637ae1268bd475ca6298c6893ab0e244378b5eb.zip | |
(ICE-6506) PHP Windows build broken
| -rw-r--r-- | cpp/include/IceSSL/Config.h | 18 | ||||
| -rw-r--r-- | cpp/include/IceSSL/Plugin.h | 18 | ||||
| -rw-r--r-- | php/src/IcePHP/Connection.cpp | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h index 11416961d99..c4769323fee 100644 --- a/cpp/include/IceSSL/Config.h +++ b/cpp/include/IceSSL/Config.h @@ -12,6 +12,24 @@ #include <Ice/Config.h> +// +// Automatically link IceSSL[D].lib with Visual C++ +// + +#if !defined(ICE_BUILDING_ICE_SSL) && defined(ICE_SSL_API_EXPORTS) +# define ICE_BUILDING_ICE_SSL +#endif + +#if defined(_MSC_VER) +# if !defined(ICE_BUILDING_ICE_SSL) +# if defined(_DEBUG) && !defined(ICE_OS_WINRT) +# pragma comment(lib, "IceSSLD.lib") +# else +# pragma comment(lib, "IceSSL.lib") +# endif +# endif +#endif + #if defined(__APPLE__) # define ICE_USE_SECURE_TRANSPORT 1 #elif defined(_WIN32) diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index 772ce4225a1..bf773f143d1 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -18,24 +18,6 @@ #include <vector> #include <list> -// -// Automatically link IceSSL[D].lib with Visual C++ -// - -#if !defined(ICE_BUILDING_ICE_SSL) && defined(ICE_SSL_API_EXPORTS) -# define ICE_BUILDING_ICE_SSL -#endif - -#if defined(_MSC_VER) -# if !defined(ICE_BUILDING_ICE_SSL) -# if defined(_DEBUG) && !defined(ICE_OS_WINRT) -# pragma comment(lib, "IceSSLD.lib") -# else -# pragma comment(lib, "IceSSL.lib") -# endif -# endif -#endif - // For struct sockaddr_storage #ifdef _WIN32 # include <winsock2.h> diff --git a/php/src/IcePHP/Connection.cpp b/php/src/IcePHP/Connection.cpp index cdb739c8693..0b03e7020f0 100644 --- a/php/src/IcePHP/Connection.cpp +++ b/php/src/IcePHP/Connection.cpp @@ -11,7 +11,7 @@ #include <Endpoint.h> #include <Types.h> #include <Util.h> -#include <IceSSL/ConnectionInfo.h> +#include <IceSSL/IceSSL.h> using namespace std; using namespace IcePHP; |