gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move quadruple_dlopen() to Fl_Posix_System_Driver.cxx where it's used.

Browse Source
This commit is contained in:
ManoloFLTK 2021-03-31 10:38:53 +02:00
parent ba03dde15c
commit 778a4577d4
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/drivers/Posix/Fl_Posix_System_Driver.cxx
View File

@ -171,6 +171,30 @@ int Fl_Posix_System_Driver::run_program(const char *program, char **argv, char *
return 1;
}
#if HAVE_DLSYM && HAVE_DLFCN_H
static void* quadruple_dlopen(const char *libname)
{
char filename2[FL_PATH_MAX];
sprintf(filename2, "%s.so", libname);
void *ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
if (!ptr) {
sprintf(filename2, "%s.so.2", libname);
ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
if (!ptr) {
sprintf(filename2, "%s.so.1", libname);
ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
if (!ptr) {
sprintf(filename2, "%s.so.0", libname);
ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
}
}
}
return ptr;
}
#endif
/**
Returns the run-time address of a function or of a shared library.
\param lib_name shared library name (without its extension) or NULL to search the function in the running program

22
src/drivers/X11/Fl_X11_System_Driver.cxx
View File

@ -569,28 +569,6 @@ int Fl_X11_System_Driver::utf8locale() {
return ret;
}
#if HAVE_DLSYM && HAVE_DLFCN_H
static void* quadruple_dlopen(const char *libname)
{
char filename2[FL_PATH_MAX];
sprintf(filename2, "%s.so", libname);
void *ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
if (!ptr) {
sprintf(filename2, "%s.so.2", libname);
ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
if (!ptr) {
sprintf(filename2, "%s.so.1", libname);
ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
if (!ptr) {
sprintf(filename2, "%s.so.0", libname);
ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL);
}
}
}
return ptr;
}
#endif
#if !defined(FL_DOXYGEN)