diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-09 08:38:08 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-09 09:57:00 +0100 |
| commit | eafb454edf188e7dada1ddf886d1e46f0151968d (patch) | |
| tree | ba62be94933e6245012a8dd73ab5cb15c0585d12 | |
| parent | 0af29175a087cc2e509962f8828790c8f7232611 (diff) | |
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>
| -rw-r--r-- | src/sna/fb/Makefile.am | 1 | ||||
| -rw-r--r-- | src/sna/fb/fb.h | 2 | ||||
| -rw-r--r-- | src/sna/fb/fbpict.h | 2 | ||||
| -rw-r--r-- | src/sna/fb/sfb.h | 40 |
4 files changed, 45 insertions, 0 deletions
diff --git a/src/sna/fb/Makefile.am b/src/sna/fb/Makefile.am index 16f9b285..72d9bbf5 100644 --- a/src/sna/fb/Makefile.am +++ b/src/sna/fb/Makefile.am @@ -5,6 +5,7 @@ libfb_la_LIBADD = $(PIXMAN_LIBS) libfb_la_SOURCES = \ fb.h \ + sfb.h \ fbarc.c \ fbarcbits.h \ fbbitmap.c \ diff --git a/src/sna/fb/fb.h b/src/sna/fb/fb.h index 7847951f..3339236e 100644 --- a/src/sna/fb/fb.h +++ b/src/sna/fb/fb.h @@ -43,6 +43,8 @@ #define DBG(x) #endif +#include "sfb.h" + #define WRITE(ptr, val) (*(ptr) = (val)) #define READ(ptr) (*(ptr)) diff --git a/src/sna/fb/fbpict.h b/src/sna/fb/fbpict.h index 6bcee34b..1ce09df2 100644 --- a/src/sna/fb/fbpict.h +++ b/src/sna/fb/fbpict.h @@ -24,6 +24,8 @@ #ifndef FBPICT_H #define FBPICT_H +#include "sfb.h" + extern void fbComposite(CARD8 op, PicturePtr pSrc, diff --git a/src/sna/fb/sfb.h b/src/sna/fb/sfb.h new file mode 100644 index 00000000..a4d9d171 --- /dev/null +++ b/src/sna/fb/sfb.h @@ -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 |