|
40 | 40 | #include "awt.h" |
41 | 41 |
|
42 | 42 | static void *gtk3_libhandle = NULL; |
43 | | -static void *gthread_libhandle = NULL; |
44 | 43 |
|
45 | 44 | static void transform_detail_string (const gchar *detail, |
46 | 45 | GtkStyleContext *context); |
@@ -77,15 +76,6 @@ static void* dl_symbol(const char* name) |
77 | 76 | return result; |
78 | 77 | } |
79 | 78 |
|
80 | | -static void* dl_symbol_gthread(const char* name) |
81 | | -{ |
82 | | - void* result = dlsym(gthread_libhandle, name); |
83 | | - if (!result) |
84 | | - longjmp(j, NO_SYMBOL_EXCEPTION); |
85 | | - |
86 | | - return result; |
87 | | -} |
88 | | - |
89 | 79 | gboolean gtk3_check(const char* lib_name, gboolean load) |
90 | 80 | { |
91 | 81 | if (gtk3_libhandle != NULL) { |
@@ -262,13 +252,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name) |
262 | 252 | return FALSE; |
263 | 253 | } |
264 | 254 |
|
265 | | - gthread_libhandle = dlopen(GTHREAD_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL); |
266 | | - if (gthread_libhandle == NULL) { |
267 | | - gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL); |
268 | | - if (gthread_libhandle == NULL) |
269 | | - return FALSE; |
270 | | - } |
271 | | - |
272 | 255 | if (setjmp(j) == 0) |
273 | 256 | { |
274 | 257 | fp_gtk_check_version = dl_symbol("gtk_check_version"); |
@@ -635,9 +618,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name) |
635 | 618 | dlclose(gtk3_libhandle); |
636 | 619 | gtk3_libhandle = NULL; |
637 | 620 |
|
638 | | - dlclose(gthread_libhandle); |
639 | | - gthread_libhandle = NULL; |
640 | | - |
641 | 621 | return NULL; |
642 | 622 | } |
643 | 623 |
|
@@ -736,7 +716,6 @@ static int gtk3_unload() |
736 | 716 |
|
737 | 717 | dlerror(); |
738 | 718 | dlclose(gtk3_libhandle); |
739 | | - dlclose(gthread_libhandle); |
740 | 719 | if ((gtk3_error = dlerror()) != NULL) |
741 | 720 | { |
742 | 721 | return FALSE; |
|
0 commit comments