Module Name: xsrc
Committed By: mrg
Date: Sat Jul 23 09:37:48 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
Log Message:
prefix cfb8_16ScreenInit with a local_ so this doesn't interfere with
the same name in xorg-server itself.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.9 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.10
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.9 Sat Jul 23 08:18:36 2011
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Sat Jul 23 09:37:48 2011
@@ -3820,7 +3820,7 @@
}
static Bool
-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+local_cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
int xsize, int ysize, int dpix, int dpiy,
int width16, int width8)
{
@@ -4015,7 +4015,7 @@
#endif
case 16:
if (cPtr->Flags & ChipsOverlay8plus16) {
- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
+ ret = local_cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
cPtr->FbOffset16, FBStart, width,
height, pScrn->xDpi, pScrn->yDpi,
displayWidth, displayWidth);
