TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

RTLD_LAZY

Browse Source
This commit is contained in:
David Rose 2009-08-31 16:36:50 +00:00
parent afc34e047d
commit 5fc0a429f6
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/plugin/load_plugin.cxx
View File

@ -156,6 +156,7 @@ load_plugin(const string &p3d_plugin_filename,
module = LoadLibrary(filename.c_str()); module = LoadLibrary(filename.c_str());
if (module == NULL) { if (module == NULL) {
// Couldn't load the DLL. // Couldn't load the DLL.
cerr << "Couldn't load " << filename << "\n";
return false; return false;
} }
@ -164,9 +165,10 @@ load_plugin(const string &p3d_plugin_filename,
#else // _WIN32 #else // _WIN32
// Posix case. // Posix case.
assert(module == NULL); assert(module == NULL);
module = dlopen(filename.c_str(), RTLD_LOCAL); module = dlopen(filename.c_str(), RTLD_LAZY | RTLD_LOCAL);
if (module == NULL) { if (module == NULL) {
// Couldn't load the .so. // Couldn't load the .so.
cerr << "Couldn't load " << filename << "\n";
return false; return false;
} }

8
direct/src/plugin/p3dPythonMain.cxx
View File

@ -191,10 +191,16 @@ main(int argc, char *argv[]) {
#else // _WIN32 #else // _WIN32
// Posix case. // Posix case.
void *module = dlopen(dll_file, RTLD_LOCAL); void *module = dlopen(dll_file, RTLD_LAZY | RTLD_LOCAL);
if (module == NULL) { if (module == NULL) {
// Couldn't load the .so. // Couldn't load the .so.
cerr << "Couldn't load " << dll_file << "\n"; cerr << "Couldn't load " << dll_file << "\n";
char *message = dlerror();
if (message != (char *)NULL) {
cerr << message << "\n";
} else {
cerr << "No error.\n";
}
return 1; return 1;
} }

2
direct/src/plugin/p3dSession.cxx
View File

@ -1399,7 +1399,7 @@ p3dpython_thread_run() {
#else // _WIN32 #else // _WIN32
// Posix case. // Posix case.
void *module = dlopen(_p3dpython_dll.c_str(), RTLD_LOCAL); void *module = dlopen(_p3dpython_dll.c_str(), RTLD_LAZY | RTLD_LOCAL);
if (module == NULL) { if (module == NULL) {
// Couldn't load the .so. // Couldn't load the .so.
nout << "Couldn't load " << _p3dpython_dll << "\n"; nout << "Couldn't load " << _p3dpython_dll << "\n";