< prev index next >

src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c

Print this page

        

*** 310,337 **** longjmp(j, NO_SYMBOL_EXCEPTION); return result; } ! gboolean gtk2_check(const char* lib_name, int flags) { if (gtk2_libhandle != NULL) { /* We've already successfully opened the GTK libs, so return true. */ return TRUE; } else { void *lib = NULL; ! lib = dlopen(lib_name, flags); if (lib == NULL) { return FALSE; } - if (flags & RTLD_NOLOAD) { - return TRUE; - } - fp_gtk_check_version = dlsym(lib, "gtk_check_version"); /* Check for GTK 2.2+ */ if (!fp_gtk_check_version(2, 2, 0)) { return TRUE; } --- 310,333 ---- longjmp(j, NO_SYMBOL_EXCEPTION); return result; } ! gboolean gtk2_check(const char* lib_name) { if (gtk2_libhandle != NULL) { /* We've already successfully opened the GTK libs, so return true. */ return TRUE; } else { void *lib = NULL; ! lib = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL); if (lib == NULL) { return FALSE; } fp_gtk_check_version = dlsym(lib, "gtk_check_version"); /* Check for GTK 2.2+ */ if (!fp_gtk_check_version(2, 2, 0)) { return TRUE; }
< prev index next >