summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2004-10-05 23:51:56 +0000
committerMark Spruiell <mes@zeroc.com>2004-10-05 23:51:56 +0000
commita52fcc9ed2cd25aaee3ae77a97cd7e182023237e (patch)
treee7ed3e5006ea042f104b01d89c9d8a724ff877fb
parentflush batch request fix (diff)
downloadice-a52fcc9ed2cd25aaee3ae77a97cd7e182023237e.tar.bz2
ice-a52fcc9ed2cd25aaee3ae77a97cd7e182023237e.tar.xz
ice-a52fcc9ed2cd25aaee3ae77a97cd7e182023237e.zip
Win32 fixes
Diffstat
-rw-r--r--py/modules/IcePy/Communicator.cpp4
-rw-r--r--py/modules/IcePy/Current.cpp4
-rw-r--r--py/modules/IcePy/Init.cpp4
-rw-r--r--py/modules/IcePy/Logger.cpp4
-rw-r--r--py/modules/IcePy/ObjectAdapter.cpp4
-rw-r--r--py/modules/IcePy/ObjectFactory.cpp4
-rw-r--r--py/modules/IcePy/Operation.cpp4
-rw-r--r--py/modules/IcePy/Properties.cpp4
-rw-r--r--py/modules/IcePy/Proxy.cpp4
-rw-r--r--py/modules/IcePy/Slice.cpp4
-rw-r--r--py/modules/IcePy/Types.cpp4
-rw-r--r--py/modules/IcePy/Util.cpp4
12 files changed, 36 insertions, 12 deletions
diff --git a/py/modules/IcePy/Communicator.cpp b/py/modules/IcePy/Communicator.cpp
index f952d58b34f..53e705690b4 100644
--- a/py/modules/IcePy/Communicator.cpp
+++ b/py/modules/IcePy/Communicator.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Communicator.h>
#include <Logger.h>
#include <ObjectAdapter.h>
diff --git a/py/modules/IcePy/Current.cpp b/py/modules/IcePy/Current.cpp
index 4b3392a811a..0432e4e2215 100644
--- a/py/modules/IcePy/Current.cpp
+++ b/py/modules/IcePy/Current.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Current.h>
#include <structmember.h>
#include <ObjectAdapter.h>
diff --git a/py/modules/IcePy/Init.cpp b/py/modules/IcePy/Init.cpp
index bb43f5b90c2..72d1887f4d0 100644
--- a/py/modules/IcePy/Init.cpp
+++ b/py/modules/IcePy/Init.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Communicator.h>
#include <Current.h>
#include <Logger.h>
diff --git a/py/modules/IcePy/Logger.cpp b/py/modules/IcePy/Logger.cpp
index bc6aae16adc..508d764ece0 100644
--- a/py/modules/IcePy/Logger.cpp
+++ b/py/modules/IcePy/Logger.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Logger.h>
#include <Util.h>
#include <Ice/Logger.h>
diff --git a/py/modules/IcePy/ObjectAdapter.cpp b/py/modules/IcePy/ObjectAdapter.cpp
index b1c351cc3b7..4c5477d7919 100644
--- a/py/modules/IcePy/ObjectAdapter.cpp
+++ b/py/modules/IcePy/ObjectAdapter.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <ObjectAdapter.h>
#include <Communicator.h>
#include <Current.h>
diff --git a/py/modules/IcePy/ObjectFactory.cpp b/py/modules/IcePy/ObjectFactory.cpp
index 62b71109139..280ab854f73 100644
--- a/py/modules/IcePy/ObjectFactory.cpp
+++ b/py/modules/IcePy/ObjectFactory.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <ObjectFactory.h>
#include <Types.h>
#include <Util.h>
diff --git a/py/modules/IcePy/Operation.cpp b/py/modules/IcePy/Operation.cpp
index 93e7a01b8b4..adbba2dd846 100644
--- a/py/modules/IcePy/Operation.cpp
+++ b/py/modules/IcePy/Operation.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Operation.h>
#include <Current.h>
#include <Proxy.h>
diff --git a/py/modules/IcePy/Properties.cpp b/py/modules/IcePy/Properties.cpp
index 9849a344c22..100ef67f5ea 100644
--- a/py/modules/IcePy/Properties.cpp
+++ b/py/modules/IcePy/Properties.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Properties.h>
#include <Util.h>
#include <Ice/Initialize.h>
diff --git a/py/modules/IcePy/Proxy.cpp b/py/modules/IcePy/Proxy.cpp
index 8ec22ee3a85..dc0ad65f20a 100644
--- a/py/modules/IcePy/Proxy.cpp
+++ b/py/modules/IcePy/Proxy.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Proxy.h>
#include <structmember.h>
#include <Util.h>
diff --git a/py/modules/IcePy/Slice.cpp b/py/modules/IcePy/Slice.cpp
index 011a844edd8..94e0cebf912 100644
--- a/py/modules/IcePy/Slice.cpp
+++ b/py/modules/IcePy/Slice.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Slice.h>
#include <Util.h>
#include <Slice/Preprocessor.h>
diff --git a/py/modules/IcePy/Types.cpp b/py/modules/IcePy/Types.cpp
index 091658f75df..14856860453 100644
--- a/py/modules/IcePy/Types.cpp
+++ b/py/modules/IcePy/Types.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Types.h>
#include <Current.h>
#include <Proxy.h>
diff --git a/py/modules/IcePy/Util.cpp b/py/modules/IcePy/Util.cpp
index c1c052bb9c0..49efd0e6a56 100644
--- a/py/modules/IcePy/Util.cpp
+++ b/py/modules/IcePy/Util.cpp
@@ -7,7 +7,9 @@
//
// **********************************************************************
-#include <IceUtil/Config.h>
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
#include <Util.h>
#include <Ice/IdentityUtil.h>
#include <Ice/LocalException.h>
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:10:53 +0000