summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/DynamicLibrary.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2002-10-28 06:25:27 +0000
committerMichi Henning <michi@zeroc.com>2002-10-28 06:25:27 +0000
commit382f7ebc87fc0d1056e257b83963d1903f7e8d27 (patch)
tree4c390abfa4a5d507ae044106619b5533232d2b14 /cpp/src/Ice/DynamicLibrary.cpp
parentchanging Mutable Realms to ZeroC (diff)
downloadice-382f7ebc87fc0d1056e257b83963d1903f7e8d27.tar.bz2
ice-382f7ebc87fc0d1056e257b83963d1903f7e8d27.tar.xz
ice-382f7ebc87fc0d1056e257b83963d1903f7e8d27.zip
First shot at porting to VC++ 2002. Code compiles, but suffers random
crashes during the tests.
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 6d7ca2aeaf5..19a4ba3c930 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -96,8 +96,12 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint)
bool
IceInternal::DynamicLibrary::load(const string& lib)
{
-#ifdef _WIN32
- _hnd = LoadLibrary(lib.c_str());
+#ifdef _WIN32
+#if _MSC_VER == 1200
+ _hnd = LoadLibrary(lib.c_str());
+#else
+ _hnd = LoadLibrary((LPCWSTR)lib.c_str()); // Type changed in VC++ 2002
+#endif
#else
_hnd = dlopen(lib.c_str(), RTLD_NOW);
if(_hnd == 0)