Restore the global xx* symbols and add them to wfbrename.h.

I don't think they're ever used, but it's best to just leave them alone for ABI
compatibility.
This commit is contained in:
Aaron Plattner 2006-09-28 13:26:54 -07:00
parent d16e83413e
commit f9542e7495
2 changed files with 11 additions and 5 deletions

View File

@ -143,10 +143,10 @@ typedef struct _xxGCPriv {
(pGC)->devPrivates[xxGCPrivateIndex].ptr)
#define xxGCPriv(pGC) xxGCPrivPtr pGCPriv = xxGetGCPriv(pGC)
static int xxScrPrivateIndex = -1;
static int xxGCPrivateIndex;
static int xxColormapPrivateIndex = -1;
static int xxGeneration;
int xxScrPrivateIndex = -1;
int xxGCPrivateIndex;
int xxColormapPrivateIndex = -1;
int xxGeneration;
#define wrap(priv,real,mem,func) {\
@ -1199,7 +1199,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
return TRUE;
}
static GCFuncs xxGCFuncs = {
GCFuncs xxGCFuncs = {
xxValidateGC, xxChangeGC, xxCopyGC, xxDestroyGC,
xxChangeClip, xxDestroyClip, xxCopyClip
};

View File

@ -187,6 +187,12 @@
#define fbWinPrivateIndex wfbWinPrivateIndex
#define fbZeroLine wfbZeroLine
#define fbZeroSegment wfbZeroSegment
#define xxScrPrivateIndex wfbxxScrPrivateIndex
#define xxGCPrivateIndex wfbxxGCPrivateIndex
#define xxColormapPrivateIndex wfbxxColormapPrivateIndex
#define xxGeneration wfbxxGeneration
#define xxPrintVisuals wfbxxPrintVisuals
#define xxGCFuncs wfbxxGCFuncs
#define xxGCOps wfbxxGCOps
#define xxSetup wfbxxSetup
#define composeFunctions wfbComposeFunctions