diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-09 15:24:22 -0700 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-04-10 09:07:38 +0100 |
| commit | d812afc1d4476ba987883fad2ef8b7c002638077 (patch) | |
| tree | a8b9b24c973890c5a9bef51d4338a7b1c76fb865 | |
| parent | a6919aa980883cf2828dc0cf813f315e3035d0cf (diff) | |
Use fbpict.h instead of defining its prototypes ourselves.
fbpict.h has been an installed header since 2008, shortly after uxa
landed. This fixes compiler warnings when other headers happen to
include fbpict.h.
| -rw-r--r-- | src/uxa/uxa-priv.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h index 3f639e73..5bf48140 100644 --- a/src/uxa/uxa-priv.h +++ b/src/uxa/uxa-priv.h @@ -53,7 +53,7 @@ #include "fb.h" #include "fboverlay.h" #ifdef RENDER -//#include "fbpict.h" +#include "fbpict.h" #include "glyphstr.h" #endif #include "damage.h" @@ -300,21 +300,6 @@ extern const GCOps uxa_ops; #ifdef RENDER -/* XXX these are in fbpict.h, which is not installed */ -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); - -void -fbAddTraps(PicturePtr pPicture, - INT16 xOff, INT16 yOff, int ntrap, xTrap * traps); - void uxa_check_composite(CARD8 op, PicturePtr pSrc, |