win fixes

4 files changed, 17 insertions, 11 deletions

diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 78625fc2b5a..9b643668aca 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -35,10 +35,6 @@ namespace IceInternal { }
 
 #if defined(WIN32)
 
-#   if !defined(_DLL) || !defined(_MT)
-#       error "Only multi-threaded DLL libraries can be used with Ice!"
-#   endif
-
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API __declspec(dllexport)
 #   else
@@ -71,7 +67,6 @@ inline int getDNSErrno() { return WSAGetLastError(); }
 #   include <unistd.h>
 
 #   define ICE_API /**/
-#   define HAVE_READLINE
 
 namespace Ice
 {
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index ae2ecdd01f2..5eaa6d52315 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -26,11 +26,11 @@ namespace Ice
 
 typedef IceUtil::Exception Exception;
 
-class ICE_API LocalException : public IceUtil::Exception
+class LocalException : public IceUtil::Exception
 {
 public:    
 
-    LocalException(const char*, int);
+    ICE_API LocalException(const char*, int);
     virtual std::string _name() const = 0;
     virtual Exception* _clone() const = 0;
     virtual void _throw() const = 0;
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index b70cef04e8d..0b26c26d02b 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -13,6 +13,16 @@
 
 #if defined(WIN32)
 
+#   if !defined(_DLL) || !defined(_MT)
+#       error "Only multi-threaded DLL libraries can be used with Ice!"
+#   endif
+
+#   ifdef ICE_UTIL_API_EXPORTS
+#       define ICE_UTIL_API __declspec(dllexport)
+#   else
+#       define ICE_UTIL_API __declspec(dllimport)
+#   endif
+
 #   include <windows.h>
 
 // '...' : forcing value to bool 'true' or 'false' (performance warning)
@@ -32,7 +42,8 @@
 
 #elif defined(__linux__) && defined(i386)
 
-// Nothing here yet
+#   define ICE_UTIL_API /**/
+#   define HAVE_READLINE
 
 #else
 
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 64c09813940..d4e3ca6c514 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -16,7 +16,7 @@
 namespace IceUtil
 {
 
-class Exception
+class ICE_UTIL_API Exception
 {
 public:
 
@@ -36,9 +36,9 @@ private:
     int _theLine;
 };
 
-std::ostream& operator<<(std::ostream&, const Exception&);
+ICE_UTIL_API std::ostream& operator<<(std::ostream&, const Exception&);
 
-class NullHandleException : public Exception
+class ICE_UTIL_API NullHandleException : public Exception
 {
 public: