Annotation of /trunk/xorg-old/patches-6.8.2-r10/9375_all_6.8.1.904-fix-duplicate-mfb-symbols.patch
Parent Directory
| 
Revision Log
Revision 167 -
(hide annotations)
(download)
Tue May 8 20:58:51 2007 UTC (17 years, 1 month ago) by niro
File size: 3635 byte(s)
Tue May 8 20:58:51 2007 UTC (17 years, 1 month ago) by niro
File size: 3635 byte(s)
-import
| 1 | niro | 167 | Index: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h |
| 2 | diff -u xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h:1.4 xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h:1.5 | ||
| 3 | --- xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h:1.4 Tue Aug 3 02:44:23 2004 | ||
| 4 | +++ xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h Fri Jan 14 17:14:08 2005 | ||
| 5 | @@ -7,6 +7,7 @@ | ||
| 6 | #define endtab xf1bppendtab | ||
| 7 | #define mask xf1bppmask | ||
| 8 | #define mergeRopBits xf1bppmergeRopBits | ||
| 9 | +#define mergeGetRopBits xf1bppmergeGetRopBits | ||
| 10 | #define mfbAllocatePrivates xf1bppAllocatePrivates | ||
| 11 | #define mfbBSFuncRec xf1bppBSFuncRec | ||
| 12 | #define mfbBlackSolidFS xf1bppBlackSolidFS | ||
| 13 | @@ -41,6 +42,7 @@ | ||
| 14 | #define mfbGCPrivateIndex xf1bppGCPrivateIndex | ||
| 15 | #define mfbGetGCPrivateIndex xf1bppGetGCPrivateIndex | ||
| 16 | #define mfbGetImage xf1bppGetImage | ||
| 17 | +#define mfbGetInverseAlu xf1bppGetInverseAlu | ||
| 18 | #define mfbGetSpans xf1bppGetSpans | ||
| 19 | #define mfbGetWindowPixmap xf1bppGetWindowPixmap | ||
| 20 | #define mfbGetWindowPrivateIndex xf1bppGetWindowPrivateIndex | ||
| 21 | @@ -62,6 +64,7 @@ | ||
| 22 | #define mfbPadPixmap xf1bppPadPixmap | ||
| 23 | #define mfbPaintWindow xf1bppPaintWindow | ||
| 24 | #define mfbPixmapToRegion xf1bppPixmapToRegion | ||
| 25 | +#define mfbPixmapToRegionWeak xf1bppPixmapToRegionWeak | ||
| 26 | #define mfbPolyFillArcSolid xf1bppPolyFillArcSolid | ||
| 27 | #define mfbPolyFillRect xf1bppPolyFillRect | ||
| 28 | #define mfbPolyGlyphBltBlack xf1bppPolyGlyphBltBlack | ||
| 29 | @@ -70,9 +73,12 @@ | ||
| 30 | #define mfbPolyPoint xf1bppPolyPoint | ||
| 31 | #define mfbPositionWindow xf1bppPositionWindow | ||
| 32 | #define mfbPushPixels xf1bppPushPixels | ||
| 33 | +#define mfbPushPixelsWeak xf1bppPushPixelsWeak | ||
| 34 | #define mfbPutImage xf1bppPutImage | ||
| 35 | #define mfbQueryBestSize xf1bppQueryBestSize | ||
| 36 | +#define mfbQueryBestSizeWeak xf1bppQueryBestSizeWeak | ||
| 37 | #define mfbRealizeFont xf1bppRealizeFont | ||
| 38 | +#define mfbRealizeFontWeak xf1bppRealizeFontWeak | ||
| 39 | #define mfbReduceRop xf1bppReduceRop | ||
| 40 | #define mfbRegisterCopyPlaneProc xf1bppRegisterCopyPlaneProc | ||
| 41 | #define mfbResolveColor xf1bppResolveColor | ||
| 42 | @@ -102,6 +108,7 @@ | ||
| 43 | #define mfbUnnaturalStippleFS xf1bppUnnaturalStippleFS | ||
| 44 | #define mfbUnnaturalTileFS xf1bppUnnaturalTileFS | ||
| 45 | #define mfbUnrealizeFont xf1bppUnrealizeFont | ||
| 46 | +#define mfbUnrealizeFontWeak xf1bppUnrealizeFontWeak | ||
| 47 | #define mfbValidateGC xf1bppValidateGC | ||
| 48 | #define mfbVertS xf1bppVertS | ||
| 49 | #define mfbWhiteSolidFS xf1bppWhiteSolidFS | ||
| 50 | Index: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h | ||
| 51 | diff -u xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h:1.2 xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h:1.3 | ||
| 52 | --- xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h:1.2 Fri Apr 23 19:54:17 2004 | ||
| 53 | +++ xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h Fri Jan 14 17:14:08 2005 | ||
| 54 | @@ -7,6 +7,7 @@ | ||
| 55 | #undef endtab | ||
| 56 | #undef mask | ||
| 57 | #undef mergeRopBits | ||
| 58 | +#undef mergeGetRopBits | ||
| 59 | #undef mfbAllocatePrivates | ||
| 60 | #undef mfbBSFuncRec | ||
| 61 | #undef mfbBlackSolidFS | ||
| 62 | @@ -39,6 +40,7 @@ | ||
| 63 | #undef mfbFillPolyWhite | ||
| 64 | #undef mfbGCPrivateIndex | ||
| 65 | #undef mfbGetImage | ||
| 66 | +#undef mfbGetInverseAlu | ||
| 67 | #undef mfbGetSpans | ||
| 68 | #undef mfbGetWindowPixmap | ||
| 69 | #undef mfbHorzS | ||
| 70 | @@ -54,6 +56,7 @@ | ||
| 71 | #undef mfbPadPixmap | ||
| 72 | #undef mfbPaintWindow | ||
| 73 | #undef mfbPixmapToRegion | ||
| 74 | +#undef mfbPixmapToRegionWeak | ||
| 75 | #undef mfbPolyFillArcSolid | ||
| 76 | #undef mfbPolyFillRect | ||
| 77 | #undef mfbPolyGlyphBltBlack | ||
| 78 | @@ -62,9 +65,12 @@ | ||
| 79 | #undef mfbPolyPoint | ||
| 80 | #undef mfbPositionWindow | ||
| 81 | #undef mfbPushPixels | ||
| 82 | +#undef mfbPushPixelsWeak | ||
| 83 | #undef mfbPutImage | ||
| 84 | #undef mfbQueryBestSize | ||
| 85 | +#undef mfbQueryBestSizeWeak | ||
| 86 | #undef mfbRealizeFont | ||
| 87 | +#undef mfbRealizeFontWeak | ||
| 88 | #undef mfbReduceRop | ||
| 89 | #undef mfbRegisterCopyPlaneProc | ||
| 90 | #undef mfbResolveColor | ||
| 91 | @@ -94,6 +100,7 @@ | ||
| 92 | #undef mfbUnnaturalStippleFS | ||
| 93 | #undef mfbUnnaturalTileFS | ||
| 94 | #undef mfbUnrealizeFont | ||
| 95 | +#undef mfbUnrealizeFontWeak | ||
| 96 | #undef mfbValidateGC | ||
| 97 | #undef mfbVertS | ||
| 98 | #undef mfbWhiteSolidFS |