diff options
author | Jose <jose@zeroc.com> | 2015-07-27 21:54:44 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-07-27 21:54:44 +0200 |
commit | 09f95c59af730209b575be0faeb8d9394c49242b (patch) | |
tree | bdb6214706de71d6f5fc6c1ffb2e382e45d94cac /python | |
parent | ICE-6302 Fixed SessionHelper to terminate connection attempt when destroy is ... (diff) | |
download | ice-09f95c59af730209b575be0faeb8d9394c49242b.tar.bz2 ice-09f95c59af730209b575be0faeb8d9394c49242b.tar.xz ice-09f95c59af730209b575be0faeb8d9394c49242b.zip |
Fix ICE-6682 - Windows Python build broken
Diffstat (limited to 'python')
-rw-r--r-- | python/modules/IcePy/EndpointInfo.cpp | 2 | ||||
-rw-r--r-- | python/modules/IcePy/Makefile.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/modules/IcePy/EndpointInfo.cpp b/python/modules/IcePy/EndpointInfo.cpp index 9df2eaae114..50065c75c13 100644 --- a/python/modules/IcePy/EndpointInfo.cpp +++ b/python/modules/IcePy/EndpointInfo.cpp @@ -12,7 +12,7 @@ #endif #include <EndpointInfo.h> #include <Util.h> -#include <IceSSL/EndpointInfo.h> +#include <IceSSL/IceSSL.h> using namespace std; using namespace IcePy; diff --git a/python/modules/IcePy/Makefile.mak b/python/modules/IcePy/Makefile.mak index f39e162a31d..6ef88199500 100644 --- a/python/modules/IcePy/Makefile.mak +++ b/python/modules/IcePy/Makefile.mak @@ -50,7 +50,7 @@ CPP_COMPILER=auto !error Invalid CPP_COMPILER setting: $(CPP_COMPILER). Must be set to VC100. !endif -CPPFLAGS = -I. $(CPPFLAGS) $(ICE_CPPFLAGS) $(PYTHON_CPPFLAGS) +CPPFLAGS = -I. $(CPPFLAGS) $(ICE_CPPFLAGS) $(PYTHON_CPPFLAGS) -DWIN32_LEAN_AND_MEAN LINKWITH = $(ICE_LIBS) $(PYTHON_LIBS) $(CXXLIBS) |