Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Rename conflicting symbols with uxa 

Reported-by: Christoph Reiter <reiter.christoph@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51887
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-09 08:38:08 +01:00
parent 0af29175a0
commit eafb454edf
4 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sna/fb/Makefile.am
View File

@ -5,6 +5,7 @@ libfb_la_LIBADD = $(PIXMAN_LIBS)
libfb_la_SOURCES = \
fb.h \
sfb.h \
fbarc.c \
fbarcbits.h \
fbbitmap.c \

2
src/sna/fb/fb.h
View File

@ -43,6 +43,8 @@
#define DBG(x)
#endif
#include "sfb.h"
#define WRITE(ptr, val) (*(ptr) = (val))
#define READ(ptr) (*(ptr))

2
src/sna/fb/fbpict.h
View File

@ -24,6 +24,8 @@
#ifndef FBPICT_H
#define FBPICT_H
#include "sfb.h"
extern void
fbComposite(CARD8 op,
PicturePtr pSrc,

40
src/sna/fb/sfb.h Normal file
View File

@ -0,0 +1,40 @@
/* And rename to avoid symbol clashes with UXA */
#define fbPolyArc sfbPolyArc
#define fbBlt sfbBlt
#define fbBltOne sfbBltOne
#define fbBltPlane sfbBltPlane
#define fbCopyNtoN sfbCopyNtoN
#define fbCopy1toN sfbCopy1toN
#define fbCopyNto1 sfbCopyNto1
#define fbCopyArea sfbCopyArea
#define fbCopyPlane sfbCopyPlane
#define fbFill sfbFill
#define fbSolidBoxClipped sfbSolidBoxClipped
#define fbPolyFillRect sfbPolyFillRect
#define fbFillSpans sfbFillSpans
#define fbPadPixmap sfbPadPixmap
#define fbValidateGC sfbValidateGC
#define fbGetSpans sfbGetSpans
#define fbPolyGlyphBlt sfbPolyGlyphBlt
#define fbImageGlyphBlt sfbImageGlyphBlt
#define fbPutImage sfbPutImage
#define fbPuXYtImage sfbPutXYImage
#define fbGetImage sfbGetImage
#define fbPolyLine sfbPolyLine
#define fbFixCoordModePrevious sfbFixCoordModePrevious
#define fbPolySegment sfbPolySegment
#define fbBitmapToRegion sfbBitmapToRegion
#define fbPolyPoint sfbPolyPoint
#define fbPushImage sfbPushImage
#define fbPushPixels sfbPushPixels
#define fbSetSpans sfbSetSpans
#define fbSegment sfbSegment
#define fbSegment1 sfbSegment1
#define fbTransparentSpan sfbTransparentSpan
#define fbStipple sfbStipple
#define fbTile sfbTile
#define fbReplicatePixel sfbReplicatePixel
#define fbComposite sfbComposite
#define image_from_pict simage_from_pict
#define free_pixmap_pict sfree_pixmap_pict