diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/Posix/Fl_Posix_System_Driver.cxx | 24 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_System_Driver.cxx | 22 |
2 files changed, 24 insertions, 22 deletions
diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx index f9324428b..4a8ccda3c 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx +++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx @@ -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 diff --git a/src/drivers/X11/Fl_X11_System_Driver.cxx b/src/drivers/X11/Fl_X11_System_Driver.cxx index c16133e15..8beed262b 100644 --- a/src/drivers/X11/Fl_X11_System_Driver.cxx +++ b/src/drivers/X11/Fl_X11_System_Driver.cxx @@ -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) |
