VC6 fixes

5 files changed, 49 insertions, 17 deletions

diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index 015e4b53f57..1a3b7e9a7d7 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -21,8 +21,8 @@ using namespace std;
 using namespace Ice;
 using namespace IceSSL;
 
-void IceSSL::incRef(Instance* p) { p->__incRef(); }
-void IceSSL::decRef(Instance* p) { p->__decRef(); }
+void IceInternal::incRef(IceSSL::Instance* p) { p->__incRef(); }
+void IceInternal::decRef(IceSSL::Instance* p) { p->__decRef(); }
 
 IceSSL::Instance::Instance(const CommunicatorPtr& communicator)
 {
@@ -30,7 +30,7 @@ IceSSL::Instance::Instance(const CommunicatorPtr& communicator)
 
     PropertiesPtr properties = communicator->getProperties();
 
-    _facade = getProtocolPluginFacade(communicator);
+    _facade = IceInternal::getProtocolPluginFacade(communicator);
     _securityTraceLevel = properties->getPropertyAsInt("IceSSL.Trace.Security");
     _securityTraceCategory = "Security";
 
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index d6d6dc35879..d27c15b7083 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -12,12 +12,32 @@
 
 #include <Ice/Handle.h>
 
+#ifndef ICE_SSL_API
+#   ifdef ICE_SSL_API_EXPORTS
+#       define ICE_SSL_API ICE_DECLSPEC_EXPORT
+#    else
+#       define ICE_SSL_API ICE_DECLSPEC_IMPORT
+#    endif
+#endif
+
 namespace IceSSL
 {
 
 class Instance;
-void incRef(Instance*);
-void decRef(Instance*);
+
+}
+
+namespace IceInternal
+{
+
+ICE_SSL_API void incRef(IceSSL::Instance*);
+ICE_SSL_API void decRef(IceSSL::Instance*);
+
+}
+
+namespace IceSSL
+{
+
 typedef IceInternal::Handle<Instance> InstancePtr;
 
 }
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index f3a10359b2d..e4a614809dc 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -27,14 +27,6 @@ using namespace std;
 using namespace Ice;
 using namespace IceSSL;
 
-#ifndef ICE_SSL_API
-#   ifdef ICE_SSL_API_EXPORTS
-#       define ICE_SSL_API ICE_DECLSPEC_EXPORT
-#    else
-#       define ICE_SSL_API ICE_DECLSPEC_IMPORT
-#    endif
-#endif
-
 //
 // Plugin factory function.
 //
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index 5e3beb72b04..b40ec41fcb4 100644
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -154,8 +154,8 @@ convertDH(unsigned char* p, int plen, unsigned char* g, int glen)
     return dh;
 }
 
-void IceSSL::incRef(DHParams* p) { p->__incRef(); }
-void IceSSL::decRef(DHParams* p) { p->__decRef(); }
+void IceInternal::incRef(IceSSL::DHParams* p) { p->__incRef(); }
+void IceInternal::decRef(IceSSL::DHParams* p) { p->__decRef(); }
 
 IceSSL::DHParams::DHParams() :
     _dh512(0), _dh1024(0), _dh2048(0), _dh4096(0)
diff --git a/cpp/src/IceSSL/UtilF.h b/cpp/src/IceSSL/UtilF.h
index 65f3dff703c..9f61b90f6a4 100644
--- a/cpp/src/IceSSL/UtilF.h
+++ b/cpp/src/IceSSL/UtilF.h
@@ -14,13 +14,33 @@
 
 #include <openssl/ssl.h>
 
+#ifndef ICE_SSL_API
+#   ifdef ICE_SSL_API_EXPORTS
+#       define ICE_SSL_API ICE_DECLSPEC_EXPORT
+#    else
+#       define ICE_SSL_API ICE_DECLSPEC_IMPORT
+#    endif
+#endif
+
 #ifndef OPENSSL_NO_DH
 namespace IceSSL
 {
 
 class DHParams;
-void incRef(DHParams*);
-void decRef(DHParams*);
+
+}
+
+namespace IceInternal
+{
+
+ICE_SSL_API void incRef(IceSSL::DHParams*);
+ICE_SSL_API void decRef(IceSSL::DHParams*);
+
+}
+
+namespace IceSSL
+{
+
 typedef IceInternal::Handle<DHParams> DHParamsPtr;
 
 }