diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-02-10 15:47:53 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-02-10 16:02:38 +0000 |
| commit | 0d75b19979b1ac14353765e2bb84c6a466129109 (patch) | |
| tree | 6f24834e1afeade3425ad376877fea5d0126bb95 | |
| parent | 9fd0d8873a5a5c4f77904cab0b9909ca941b5dae (diff) | |
sna: Restore glyphs with xorg-1.12
That simple and innocuous build fix for xorg-1.13 bizarrely causes
missing glyphs with earlier Xorgs.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/compat-api.h | 2 | ||||
| -rw-r--r-- | src/sna/fb/fbpict.c | 5 | ||||
| -rw-r--r-- | src/sna/fb/fbpict.h | 20 |
3 files changed, 16 insertions, 11 deletions
diff --git a/src/compat-api.h b/src/compat-api.h index 2a912e5d..6d147c74 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -28,8 +28,10 @@ #ifndef COMPAT_API_H #define COMPAT_API_H +#include <xorg-server.h> #include <xorgVersion.h> +#include <picturestr.h> #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR #define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] #define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p diff --git a/src/sna/fb/fbpict.c b/src/sna/fb/fbpict.c index 27bed148..906a5f31 100644 --- a/src/sna/fb/fbpict.c +++ b/src/sna/fb/fbpict.c @@ -25,11 +25,8 @@ #include <string.h> -#include <picturestr.h> -#include <mipict.h> -#include <fbpict.h> - #include "fb.h" +#include "fbpict.h" static void SourceValidateOnePicture(PicturePtr picture) diff --git a/src/sna/fb/fbpict.h b/src/sna/fb/fbpict.h index 1ce09df2..56013853 100644 --- a/src/sna/fb/fbpict.h +++ b/src/sna/fb/fbpict.h @@ -24,17 +24,23 @@ #ifndef FBPICT_H #define FBPICT_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <picturestr.h> + #include "sfb.h" extern void fbComposite(CARD8 op, - PicturePtr pSrc, - PicturePtr pMask, - PicturePtr pDst, - INT16 xSrc, - INT16 ySrc, - INT16 xMask, - INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height); + PicturePtr pSrc, + PicturePtr pMask, + PicturePtr pDst, + INT16 xSrc, INT16 ySrc, + INT16 xMask, INT16 yMask, + INT16 xDst, INT16 yDst, + CARD16 width, CARD16 height); extern pixman_image_t *image_from_pict(PicturePtr pict, Bool has_clip, |