From 0c55cd1aca19b57a9b8837d1672ae260cfca4d78 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sun, 4 Oct 2020 08:20:50 +0200 Subject: Create Fl_X11_System_Driver::dlopen_or_dlsym() for run-time addresses. The intent is to gather in a single place of the X11 platform source code all variable elements when using dlopen() and dlsym() system functions (e.g., .so vs .dylib extension name, is RTLD_DEFAULT available, locations to be sought). Member function Fl_System_Driver::load() is created only to support Fl_Plugin_Manager::load(). --- src/drivers/WinAPI/Fl_WinAPI_System_Driver.H | 2 +- src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/drivers/WinAPI') diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H index 0dd12ca17..1860bc8b3 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H @@ -88,7 +88,7 @@ public: virtual void newUUID(char *uuidBuffer); virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, const char *application); - virtual void *dlopen(const char *filename); + virtual void *load(const char *filename); virtual void png_extra_rgba_processing(unsigned char *array, int w, int h); virtual const char *next_dir_sep(const char *start); // these 3 are implemented in Fl_lock.cxx diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index 025d4ee37..518b32845 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -912,7 +912,7 @@ char *Fl_WinAPI_System_Driver::preference_rootnode(Fl_Preferences *prefs, Fl_Pre return filename; } -void *Fl_WinAPI_System_Driver::dlopen(const char *filename) { +void *Fl_WinAPI_System_Driver::load(const char *filename) { return LoadLibraryW(utf8_to_wchar(filename, wbuf)); } -- cgit v1.2.3