diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2011-06-16 08:47:56 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2011-06-16 15:11:24 +0200 |
| commit | f409f74decf63b3dbf68b713317a1eb17cd71a0f (patch) | |
| tree | c61b157f582c4501f1bbdab3251baea18f9d6563 /src/cairo-xlib-screen.c | |
| parent | a2cd83a98670b7dd03aeb41334d6e2fb030048af (diff) | |
| download | cairo-f409f74decf63b3dbf68b713317a1eb17cd71a0f.tar.gz | |
xlib: Fix build of xlib-xcb
45665c0d48396af7bd653d546115a5f36cfa9ae1 breaks the build of
cairo-xlib-xcb because it does not disable the compilation of
cairo-xlib implementation files when cairo-xlib-xcb is enable. This
results in collisions when linking.
Reported-by: James Cloos <cloos@jhcloos.com>
Diffstat (limited to 'src/cairo-xlib-screen.c')
| -rw-r--r-- | src/cairo-xlib-screen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c index a0c3df840..8ac99351f 100644 --- a/src/cairo-xlib-screen.c +++ b/src/cairo-xlib-screen.c @@ -54,6 +54,8 @@ #include "cairoint.h" +#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS + #include "cairo-xlib-private.h" #include "cairo-xlib-xrender-private.h" @@ -464,3 +466,5 @@ _cairo_xlib_screen_get_font_options (cairo_xlib_screen_t *info) return &info->font_options; } + +#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */ |