summaryrefslogtreecommitdiff
path: root/src/cairo-xlib-surface-private.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-09-01 23:12:43 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2009-09-01 23:12:43 +0100
commit7d1eb259f93d3f2f2e754b2b8b90cb88359b477d (patch)
treeb608289649a97f6d0088246c1e09abb9fc1ad17b /src/cairo-xlib-surface-private.h
parentb8ddd66cf6e0d16383580c3c3398343f577b89fd (diff)
downloadcairo-7d1eb259f93d3f2f2e754b2b8b90cb88359b477d.tar.gz
[xlib] Make xlib_display_t private and rename xlib_screen_info_t
The issue Joonas was trying to solve was the unwanted inclusion of the inlines via cairo-freelist-private.h. Unwittingly he included cairoint.h from cairo-xlib-private.h instead, a far more heinous crime as that causes the boilerplate to try to use the hidden, private symbols. Instead we resolve this issue by making the cairo_xlib_display_t structure private to cairo-xlib-display.c and provide functions to manipulate the abstract data type. Whilst in the vicinity, we rename cairo_xlib_screen_info_t to cairo_xlib_screen_t for consistency and cleanliness.
Diffstat (limited to 'src/cairo-xlib-surface-private.h')
-rw-r--r--src/cairo-xlib-surface-private.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cairo-xlib-surface-private.h b/src/cairo-xlib-surface-private.h
index cb97650bb..b3cbe045d 100644
--- a/src/cairo-xlib-surface-private.h
+++ b/src/cairo-xlib-surface-private.h
@@ -46,12 +46,11 @@ struct _cairo_xlib_surface {
Display *dpy;
cairo_xlib_display_t *display;
- cairo_xlib_screen_info_t *screen_info;
+ cairo_xlib_screen_t *screen;
cairo_xlib_hook_t close_display_hook;
GC gc;
Drawable drawable;
- Screen *screen;
cairo_bool_t owns_pixmap;
Visual *visual;