diff options
| author | Rolf Theunissen | 2016-10-17 09:07:26 +0000 |
|---|---|---|
| committer | Rolf Theunissen | 2016-10-17 09:07:26 +0000 |
| commit | 0cd4677e73a3cdd167c648b0e093156d0dc02c27 (patch) | |
| tree | e4cdcd2329ede7c1fe6a8ea67374fa7ff20c97c9 | |
| parent | c017b0ffd1cc78298fe7e738d85f2ba3b1618372 (diff) | |
| download | eclipse.platform.swt-0cd4677e73a3cdd167c648b0e093156d0dc02c27.tar.gz eclipse.platform.swt-0cd4677e73a3cdd167c648b0e093156d0dc02c27.tar.xz eclipse.platform.swt-0cd4677e73a3cdd167c648b0e093156d0dc02c27.zip | |
Bug 505334 - SWT for GTK fails to compile when X11 is not available
Dynamically called X11 functions should not be compiled as well
Signed-off-by: Rolf Theunissen <rolf.theunissen@altran.com>
3 files changed, 30 insertions, 19 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h index 1971095a3e..332b4497ed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h @@ -27,6 +27,8 @@ #include <cairo-xlib.h> #else #define NO__1cairo_1xlib_1surface_1create +#define NO__1cairo_1xlib_1surface_1get_1height +#define NO__1cairo_1xlib_1surface_1get_1width #endif #include <string.h> #include <dlfcn.h> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h index 87252e2584..032975e34c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h @@ -36,11 +36,13 @@ #define cairo_image_surface_get_data_LIB LIB_CAIRO #define cairo_image_surface_get_format_LIB LIB_CAIRO #define cairo_image_surface_get_stride_LIB LIB_CAIRO -#define cairo_xlib_surface_get_drawable_LIB LIB_CAIRO -#define cairo_xlib_surface_get_height_LIB LIB_CAIRO -#define cairo_xlib_surface_get_width_LIB LIB_CAIRO #define cairo_surface_get_content_LIB LIB_CAIRO #define cairo_push_group_LIB LIB_CAIRO #define cairo_pop_group_to_source_LIB LIB_CAIRO #define cairo_region_num_rectangles_LIB LIB_CAIRO #define cairo_region_get_rectangle_LIB LIB_CAIRO + +#ifdef CAIRO_HAS_XLIB_SURFACE +#define cairo_xlib_surface_get_height_LIB LIB_CAIRO +#define cairo_xlib_surface_get_width_LIB LIB_CAIRO +#endif 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 acb47a4236..249559a280 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 @@ -58,15 +58,7 @@ #endif /* Libraries for dynamic loaded functions */ -#define XRenderQueryExtension_LIB LIB_XRENDER -#define XRenderQueryVersion_LIB LIB_XRENDER -#define XRenderFindStandardFormat_LIB LIB_XRENDER -#define XRenderFindVisualFormat_LIB LIB_XRENDER -#define XRenderComposite_LIB LIB_XRENDER -#define XRenderCreatePicture_LIB LIB_XRENDER -#define XRenderFreePicture_LIB LIB_XRENDER -#define XRenderSetPictureClipRectangles_LIB LIB_XRENDER -#define XRenderSetPictureTransform_LIB LIB_XRENDER + #define g_thread_init_LIB LIB_GTHREAD #define gtk_widget_set_allocation_LIB LIB_GTK #define gtk_widget_set_opacity_LIB LIB_GTK @@ -339,13 +331,6 @@ #define gtk_widget_get_modifier_style_LIB LIB_GTK #define gtk_widget_set_focus_on_click_LIB LIB_GTK #define gtk_range_get_slider_range_LIB LIB_GTK -#define gdk_x11_screen_get_window_manager_name_LIB LIB_GDK -#define gdk_x11_screen_lookup_visual_LIB LIB_GDK -#define gdk_x11_window_lookup_for_display_LIB LIB_GDK -#define gdk_x11_display_utf8_to_compound_text_LIB LIB_GDK -#define gdk_x11_drawable_get_xid_LIB LIB_GDK -#define gdk_x11_get_default_xdisplay_LIB LIB_GDK -#define gdk_x11_window_get_xid_LIB LIB_GDK #define gdk_threads_set_lock_functions_LIB LIB_GDK #define atk_object_add_relationship_LIB LIB_ATK @@ -433,6 +418,28 @@ #define g_thread_supported() 0 #endif + +#ifdef GDK_WINDOWING_X11 + +#define XRenderQueryExtension_LIB LIB_XRENDER +#define XRenderQueryVersion_LIB LIB_XRENDER +#define XRenderFindStandardFormat_LIB LIB_XRENDER +#define XRenderFindVisualFormat_LIB LIB_XRENDER +#define XRenderComposite_LIB LIB_XRENDER +#define XRenderCreatePicture_LIB LIB_XRENDER +#define XRenderFreePicture_LIB LIB_XRENDER +#define XRenderSetPictureClipRectangles_LIB LIB_XRENDER +#define XRenderSetPictureTransform_LIB LIB_XRENDER +#define gdk_x11_screen_get_window_manager_name_LIB LIB_GDK +#define gdk_x11_screen_lookup_visual_LIB LIB_GDK +#define gdk_x11_window_lookup_for_display_LIB LIB_GDK +#define gdk_x11_display_utf8_to_compound_text_LIB LIB_GDK +#define gdk_x11_drawable_get_xid_LIB LIB_GDK +#define gdk_x11_get_default_xdisplay_LIB LIB_GDK +#define gdk_x11_window_get_xid_LIB LIB_GDK + +#endif + /* Field accessors */ #if GTK_CHECK_VERSION(3,0,0) #define GTK_WIDGET_FLAGS(arg0) 0 |