[Intel-gfx] [PATCH 2/3] Use fbpict.h instead of defining its prototypes ourselves.

[Eric Anholt]

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.
---
 src/uxa/uxa-priv.h | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h
index 3f639e7..5bf4814 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,
-- 
1.9.1