|
42 | 42 | #include "debug_assert.h" |
43 | 43 |
|
44 | 44 | static void *gtk3_libhandle = NULL; |
45 | | -static void *gthread_libhandle = NULL; |
46 | 45 |
|
47 | 46 | static void transform_detail_string (const gchar *detail, |
48 | 47 | GtkStyleContext *context); |
@@ -79,15 +78,6 @@ static void* dl_symbol(const char* name) |
79 | 78 | return result; |
80 | 79 | } |
81 | 80 |
|
82 | | -static void* dl_symbol_gthread(const char* name) |
83 | | -{ |
84 | | - void* result = dlsym(gthread_libhandle, name); |
85 | | - if (!result) |
86 | | - longjmp(j, NO_SYMBOL_EXCEPTION); |
87 | | - |
88 | | - return result; |
89 | | -} |
90 | | - |
91 | 81 | gboolean gtk3_check(const char* lib_name, gboolean load) |
92 | 82 | { |
93 | 83 | if (gtk3_libhandle != NULL) { |
@@ -264,13 +254,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name) |
264 | 254 | return FALSE; |
265 | 255 | } |
266 | 256 |
|
267 | | - gthread_libhandle = dlopen(GTHREAD_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL); |
268 | | - if (gthread_libhandle == NULL) { |
269 | | - gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL); |
270 | | - if (gthread_libhandle == NULL) |
271 | | - return FALSE; |
272 | | - } |
273 | | - |
274 | 257 | if (setjmp(j) == 0) |
275 | 258 | { |
276 | 259 | fp_gtk_check_version = dl_symbol("gtk_check_version"); |
@@ -637,9 +620,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name) |
637 | 620 | dlclose(gtk3_libhandle); |
638 | 621 | gtk3_libhandle = NULL; |
639 | 622 |
|
640 | | - dlclose(gthread_libhandle); |
641 | | - gthread_libhandle = NULL; |
642 | | - |
643 | 623 | return NULL; |
644 | 624 | } |
645 | 625 |
|
@@ -738,7 +718,6 @@ static int gtk3_unload() |
738 | 718 |
|
739 | 719 | dlerror(); |
740 | 720 | dlclose(gtk3_libhandle); |
741 | | - dlclose(gthread_libhandle); |
742 | 721 | if ((gtk3_error = dlerror()) != NULL) |
743 | 722 | { |
744 | 723 | return FALSE; |
|
0 commit comments