Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-01-12 08:42:29 -0500
committerAlexander Kurtakov2018-01-12 08:46:17 -0500
commitbcbd76cfedf5ed62e228a8a0eddac18e01027d22 (patch)
tree60ae903ccf288cd73f804b966d542324f1035416
parentb36d03308555185440bae8c1c42b2dc3e90b95a4 (diff)
downloadeclipse.platform.swt-bcbd76cfedf5ed62e228a8a0eddac18e01027d22.tar.gz
eclipse.platform.swt-bcbd76cfedf5ed62e228a8a0eddac18e01027d22.tar.xz
eclipse.platform.swt-bcbd76cfedf5ed62e228a8a0eddac18e01027d22.zip
Bug 529728 - Load dynamic glib functions from libglib
They are loaded from gtk relying on the fact that gtk is linked against glib. Better to load from libglib explicitly for safety reason. Change-Id: I6cd4e3e0a778ff9cd21d6ae5f57f3bf64bd4e066 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
index 0d64bae45e..1c0cd351e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
@@ -33,6 +33,7 @@
#define LIB_GTK "libgtk-x11-2.0.a(libgtk-x11-2.0.so.0)"
#define LIB_GDK "libgdk-x11-2.0.a(libgdk-x11-2.0.so.0)"
#define LIB_GTHREAD "libgthread-2.0.a(libgthread-2.0.so.0)"
+#define LIB_GLIB "libglib-2.0.a(libglib-2.0.so.0)"
#define LIB_ATK "libatk-1.0.a(libatk-1.0.so.0)"
#define LIB_FONTCONFIG "libfontconfig.a(libfontconfig.so.1)"
#elif _WIN32
@@ -55,6 +56,7 @@
#define LIB_GDK "libgdk-x11-2.0.so.0"
#endif
#define LIB_GTHREAD "libgthread-2.0.so.0"
+#define LIB_GLIB "libglib-2.0.so.0"
#define LIB_ATK "libatk-1.0.so.0"
#define LIB_FONTCONFIG "libfontconfig.so.1"
#endif
@@ -305,8 +307,8 @@
#define gtk_drag_set_icon_surface_LIB LIB_GTK
#define gtk_accel_label_set_accel_LIB LIB_GTK
#define gtk_drag_begin_with_coordinates_LIB LIB_GTK
-#define g_bytes_new_LIB LIB_GTK
-#define g_bytes_unref_LIB LIB_GTK
+#define g_bytes_new_LIB LIB_GLIB
+#define g_bytes_unref_LIB LIB_GLIB
#ifndef g_thread_supported
#define g_thread_supported() 0

Back to the top