diff options
| author | Manolo Gouy <Manolo> | 2014-10-01 17:24:55 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2014-10-01 17:24:55 +0000 |
| commit | ecbda612207d3147ca5a5383e65cdc48a60faa77 (patch) | |
| tree | 7116b8439351216355c7778fd40d91d62229e824 /src/Fl_Native_File_Chooser_GTK.cxx | |
| parent | fca603cc3577770709603b9d06ba414c06a87b23 (diff) | |
Protect use of dlopen() and dlsym() with HAVE_DLSYM and HAVE_DLFCN_H for compatibility with cases where these functions aren’t available.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10349 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Native_File_Chooser_GTK.cxx')
| -rw-r--r-- | src/Fl_Native_File_Chooser_GTK.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Fl_Native_File_Chooser_GTK.cxx b/src/Fl_Native_File_Chooser_GTK.cxx index 7b7fbe155..1b4751107 100644 --- a/src/Fl_Native_File_Chooser_GTK.cxx +++ b/src/Fl_Native_File_Chooser_GTK.cxx @@ -17,7 +17,9 @@ // #include <FL/x.H> +#if HAVE_DLSYM && HAVE_DLFCN_H #include <dlfcn.h> // for dlopen et al +#endif #include <locale.h> // for setlocale /* --------------------- Type definitions from GLIB and GTK --------------------- */ @@ -620,8 +622,9 @@ int Fl_GTK_File_Chooser::fl_gtk_chooser_wrapper() return result; } // fl_gtk_chooser_wrapper +#if HAVE_DLSYM && HAVE_DLFCN_H // macro to help with the symbol loading boilerplate... -#define GET_SYM(SSS, LLL) \ +# define GET_SYM(SSS, LLL) \ dlerror(); /* Clear any existing error */ \ fl_##SSS = (XX_##SSS)dlsym(LLL, #SSS); \ if ((pc_dl_error = dlerror()) != NULL) { \ @@ -635,6 +638,7 @@ static void* fl_dlopen(const char *filename1, const char *filename2) if (!ptr) ptr = dlopen(filename2, RTLD_LAZY | RTLD_GLOBAL); return ptr; } +#endif /* * Use dlopen to see if we can load the gtk dynamic libraries that @@ -642,6 +646,7 @@ static void* fl_dlopen(const char *filename1, const char *filename2) * without linking to the GTK libs at compile time. */ void Fl_GTK_File_Chooser::probe_for_GTK_libs(void) { +#if HAVE_DLSYM && HAVE_DLFCN_H void *ptr_glib = NULL; void *ptr_gtk = NULL; @@ -719,6 +724,7 @@ void Fl_GTK_File_Chooser::probe_for_GTK_libs(void) { GET_SYM(gtk_toggle_button_set_active, ptr_gtk); did_find_GTK_libs = 1; +#endif } // probe_for_GTK_libs // |