summaryrefslogtreecommitdiff
path: root/Source/cmDynamicLoader.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2003-05-28 09:21:37 -0400
committerBill Hoffman <bill.hoffman@kitware.com>2003-05-28 09:21:37 -0400
commit8cb6645ad8779c7066a9a31907004506b595aab2 (patch)
tree0fb33f0cf62d41c4532068d38b96600d2a10474a /Source/cmDynamicLoader.cxx
parent64db4e2cd8706ea91a8598145cff5d7607e3bfd2 (diff)
downloadcmake-8cb6645ad8779c7066a9a31907004506b595aab2.tar.gz
Remove some borland 6 warnings
Diffstat (limited to 'Source/cmDynamicLoader.cxx')
-rw-r--r--Source/cmDynamicLoader.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmDynamicLoader.cxx b/Source/cmDynamicLoader.cxx
index 8eff2e787e..d9cd119185 100644
--- a/Source/cmDynamicLoader.cxx
+++ b/Source/cmDynamicLoader.cxx
@@ -259,15 +259,14 @@ int cmDynamicLoader::CloseLibrary(cmLibHandle lib)
cmDynamicLoaderFunction
cmDynamicLoader::GetSymbolAddress(cmLibHandle lib, const char* sym)
{
- void* result = 0;
#ifdef UNICODE
- wchar_t *wsym = new wchar_t [mbstowcs(NULL, sym, 32000)];
- mbstowcs(wsym, sym, 32000);
- void *ret = GetProcAddress(lib, wsym);
- delete [] wsym;
- result = ret;
+ wchar_t *wsym = new wchar_t [mbstowcs(NULL, sym, 32000)];
+ mbstowcs(wsym, sym, 32000);
+ void *ret = GetProcAddress(lib, wsym);
+ delete [] wsym;
+ void* result = ret;
#else
- result = GetProcAddress(lib, sym);
+ void* result = GetProcAddress(lib, sym);
#endif
// Hack to cast pointer-to-data to pointer-to-function.
return *reinterpret_cast<cmDynamicLoaderFunction*>(&result);