summaryrefslogtreecommitdiff
path: root/src/cairo-xlib-screen.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-06-28 17:10:59 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-06-28 17:11:54 +0100
commit97a88c5adb08a3181bad1f63a7bbdfe5784b4207 (patch)
tree07a0e309356ef17fa7fc792a0c22fc607d80aedb /src/cairo-xlib-screen.c
parent7d6910014310344e5d16c97ffd1f1c9fbc01b143 (diff)
downloadcairo-97a88c5adb08a3181bad1f63a7bbdfe5784b4207.tar.gz
xlib: Compile without fontconfig
Create a cairo-fontconfig-private.h where we can add the missing defines in a common location rather than in the body of the code.
Diffstat (limited to 'src/cairo-xlib-screen.c')
-rw-r--r--src/cairo-xlib-screen.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c
index db01a8433..801dc3da7 100644
--- a/src/cairo-xlib-screen.c
+++ b/src/cairo-xlib-screen.c
@@ -60,9 +60,7 @@
#include "cairo-xlib-surface-private.h"
#include "cairo-error-private.h"
-#if CAIRO_HAS_FC_FONT
-#include <fontconfig/fontconfig.h>
-#endif
+#include "cairo-fontconfig-private.h"
static int
parse_boolean (const char *v)
@@ -128,22 +126,6 @@ get_integer_default (Display *dpy,
return FALSE;
}
-#ifndef FC_RGBA_UNKNOWN
-#define FC_RGBA_UNKNOWN 0
-#define FC_RGBA_RGB 1
-#define FC_RGBA_BGR 2
-#define FC_RGBA_VRGB 3
-#define FC_RGBA_VBGR 4
-#define FC_RGBA_NONE 5
-#endif
-
-#ifndef FC_HINT_NONE
-#define FC_HINT_NONE 0
-#define FC_HINT_SLIGHT 1
-#define FC_HINT_MEDIUM 2
-#define FC_HINT_FULL 3
-#endif
-
static void
_cairo_xlib_init_screen_font_options (Display *dpy,
cairo_xlib_screen_t *info)