Contents of /trunk/xorg-old/patches-6.8.2-r10/9370_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch
Parent Directory
| 
Revision Log
Revision 167 -
(show annotations)
(download)
Tue May 8 20:58:51 2007 UTC (17 years ago) by niro
File size: 2842 byte(s)
Tue May 8 20:58:51 2007 UTC (17 years ago) by niro
File size: 2842 byte(s)
-import
| 1 | Index: xc/programs/Xserver/cfb/cfbmap.h |
| 2 | diff -u xc/programs/Xserver/cfb/cfbmap.h:1.3 xc/programs/Xserver/cfb/cfbmap.h:1.4 |
| 3 | --- xc/programs/Xserver/cfb/cfbmap.h:1.3 Fri Jan 14 08:37:30 2005 |
| 4 | +++ xc/programs/Xserver/cfb/cfbmap.h Mon Jan 17 17:17:45 2005 |
| 5 | @@ -230,7 +230,9 @@ |
| 6 | #define cfbBresD CFBNAME(BresD) |
| 7 | #define cfbBresS CFBNAME(BresS) |
| 8 | #define cfbChangeWindowAttributes CFBNAME(ChangeWindowAttributes) |
| 9 | +#define cfbClearVisualTypes CFBNAME(cfbClearVisualTypes) |
| 10 | #define cfbCloseScreen CFBNAME(CloseScreen) |
| 11 | +#define cfbCreateDefColormap CFBNAME (cfbCreateDefColormap) |
| 12 | #define cfbCopyArea CFBNAME(CopyArea) |
| 13 | #define cfbCopyImagePlane CFBNAME(CopyImagePlane) |
| 14 | #define cfbCopyPixmap CFBNAME(CopyPixmap) |
| 15 | @@ -249,6 +251,7 @@ |
| 16 | #define cfbDoBitbltGeneral CFBNAME(DoBitbltGeneral) |
| 17 | #define cfbDoBitbltOr CFBNAME(DoBitbltOr) |
| 18 | #define cfbDoBitbltXor CFBNAME(DoBitbltXor) |
| 19 | +#define cfbExpandDirectColors CFBNAME(cfbExpandDirectColors) |
| 20 | #define cfbFillBoxSolid CFBNAME(FillBoxSolid) |
| 21 | #define cfbFillBoxTile32 CFBNAME(FillBoxTile32) |
| 22 | #define cfbFillBoxTile32sCopy CFBNAME(FillBoxTile32sCopy) |
| 23 | @@ -277,6 +280,7 @@ |
| 24 | #define cfbHorzS CFBNAME(HorzS) |
| 25 | #define cfbImageGlyphBlt8 CFBNAME(ImageGlyphBlt8) |
| 26 | #define cfbInitializeColormap CFBNAME(InitializeColormap) |
| 27 | +#define cfbInitVisuals CFBNAME(cfbInitVisuals) |
| 28 | #define cfbInstallColormap CFBNAME(InstallColormap) |
| 29 | #define cfbLineSD CFBNAME(LineSD) |
| 30 | #define cfbLineSS CFBNAME(LineSS) |
| 31 | @@ -306,6 +310,7 @@ |
| 32 | #define cfbSetScanline CFBNAME(SetScanline) |
| 33 | #define cfbSetScreenPixmap CFBNAME(SetScreenPixmap) |
| 34 | #define cfbSetSpans CFBNAME(SetSpans) |
| 35 | +#define cfbSetVisualTypes CFBNAME(cfbSetVisualTypes) |
| 36 | #define cfbSetupScreen CFBNAME(SetupScreen) |
| 37 | #define cfbSolidSpansCopy CFBNAME(SolidSpansCopy) |
| 38 | #define cfbSolidSpansGeneral CFBNAME(SolidSpansGeneral) |
| 39 | Index: xc/programs/Xserver/cfb/cfbunmap.h |
| 40 | diff -u xc/programs/Xserver/cfb/cfbunmap.h:1.2 xc/programs/Xserver/cfb/cfbunmap.h:1.3 |
| 41 | --- xc/programs/Xserver/cfb/cfbunmap.h:1.2 Fri Jan 14 08:37:30 2005 |
| 42 | +++ xc/programs/Xserver/cfb/cfbunmap.h Mon Jan 17 17:17:45 2005 |
| 43 | @@ -53,7 +53,9 @@ |
| 44 | #undef cfbBresD |
| 45 | #undef cfbBresS |
| 46 | #undef cfbChangeWindowAttributes |
| 47 | +#undef cfbClearVisualTypes |
| 48 | #undef cfbCloseScreen |
| 49 | +#undef cfbCreateDefColormap |
| 50 | #undef cfbCopyArea |
| 51 | #undef cfbCopyImagePlane |
| 52 | #undef cfbCopyPixmap |
| 53 | @@ -72,6 +74,7 @@ |
| 54 | #undef cfbDoBitbltGeneral |
| 55 | #undef cfbDoBitbltOr |
| 56 | #undef cfbDoBitbltXor |
| 57 | +#undef cfbExpandDirectColors |
| 58 | #undef cfbFillBoxSolid |
| 59 | #undef cfbFillBoxTile32 |
| 60 | #undef cfbFillBoxTile32sCopy |
| 61 | @@ -100,6 +103,7 @@ |
| 62 | #undef cfbHorzS |
| 63 | #undef cfbImageGlyphBlt8 |
| 64 | #undef cfbInitializeColormap |
| 65 | +#undef cfbInitVisuals |
| 66 | #undef cfbInstallColormap |
| 67 | #undef cfbLineSD |
| 68 | #undef cfbLineSS |
| 69 | @@ -129,6 +133,7 @@ |
| 70 | #undef cfbSetScanline |
| 71 | #undef cfbSetScreenPixmap |
| 72 | #undef cfbSetSpans |
| 73 | +#undef cfbSetVisualTypes |
| 74 | #undef cfbSetupScreen |
| 75 | #undef cfbSolidSpansCopy |
| 76 | #undef cfbSolidSpansGeneral |