diff options
| author | Jose <jose@zeroc.com> | 2013-01-21 15:41:46 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-21 15:41:46 +0100 |
| commit | 6a788321deaf163d6ed1e5536034aa2d590fdbf6 (patch) | |
| tree | c0c40a1804e8e63c62bb2794bdc0086ddf0bda40 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | Updated EJB test (diff) | |
| download | ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.tar.bz2 ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.tar.xz ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.zip | |
Undo OS X Frameworks updates
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 7dd0ea2fcf3..62b62c51dc4 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -170,9 +170,8 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef __APPLE__ // - // On OS X fallback to .so and .bundle extensions, we also fallback - // to use the library name without an extesion in case is an OS X - // Framework, if the default .dylib fails. + // On OS X fallback to .so and .bundle extensions, if the default + // .dylib fails. // if(!load(lib + ".dylib")) { @@ -183,12 +182,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc if(!load(lib + ".bundle")) { _err = errMsg + "; " + _err; - - if(!load(libPath + libName)) - { - _err = errMsg + "; " + _err; - return 0; - } + return 0; } } _err = ""; |