frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide or rename more global symbols to avoid clashes with libfb. 

Rename composeFunctions, xxSetup, and xxPrintVisuals.  Hide the other xx*
symbols by making them static.
This commit is contained in:
Aaron Plattner 2006-09-20 12:47:17 -07:00
parent f39fd42429
commit d16e83413e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fb/fbpseudocolor.c
View File

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

3
fb/wfbrename.h
View File

@ -187,3 +187,6 @@
#define fbWinPrivateIndex wfbWinPrivateIndex #define fbWinPrivateIndex wfbWinPrivateIndex
#define fbZeroLine wfbZeroLine #define fbZeroLine wfbZeroLine
#define fbZeroSegment wfbZeroSegment #define fbZeroSegment wfbZeroSegment
#define xxPrintVisuals wfbxxPrintVisuals
#define xxSetup wfbxxSetup
#define composeFunctions wfbComposeFunctions