diff options
| author | Jose <pepone@users.noreply.github.com> | 2023-09-18 11:10:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 11:10:14 +0200 |
| commit | e1cb50caff3ec87a31a138b575dded4527308365 (patch) | |
| tree | ead9b705bb65751dcd3861f5e65c39e08a5ade9d /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | Fix Objective-C build failures (#1496) (diff) | |
| download | ice-e1cb50caff3ec87a31a138b575dded4527308365.tar.bz2 ice-e1cb50caff3ec87a31a138b575dded4527308365.tar.xz ice-e1cb50caff3ec87a31a138b575dded4527308365.zip | |
Remove uwp (#1504)
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 5685d1bfa3f..286ef39c6d5 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -128,9 +128,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib += libName; lib += version; -# ifdef ICE_OS_UWP - lib += "uwp"; -# endif # ifdef ICE_CPP11_MAPPING lib += "++11"; @@ -212,9 +209,7 @@ IceInternal::DynamicLibrary::load(const string& lib) // Don't need to use a wide string converter as the wide string is passed // to Windows API. // -#if defined(ICE_OS_UWP) - _hnd = LoadPackagedLibrary(stringToWstring(lib, getProcessStringConverter()).c_str(), 0); -#elif defined(_WIN32) +#if defined(_WIN32) _hnd = LoadLibraryW(stringToWstring(lib, getProcessStringConverter()).c_str()); #else int flags = RTLD_NOW | RTLD_GLOBAL; @@ -229,9 +224,7 @@ IceInternal::DynamicLibrary::load(const string& lib) // // Remember the most recent error in _err. // -#if defined(ICE_OS_UWP) - _err = "LoadPackagedLibrary on `" + lib + "' failed with `" + IceUtilInternal::lastErrorToString() + "'"; -#elif defined(_WIN32) +#if defined(_WIN32) _err = "LoadLibraryW on `" + lib + "' failed with `" + IceUtilInternal::lastErrorToString() + "'"; #else const char* err = dlerror(); |