diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2006-09-20 12:47:17 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-09-20 12:47:17 -0700 |
| commit | d16e83413e7e06adebd629d04de57bbedd8c3765 (patch) | |
| tree | a770381e62ff578887a91aaa5bd7bfdf9c08feb5 /fb | |
| parent | f39fd4242902eaa862321d39337f429dd14ebacf (diff) | |
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.
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fbpseudocolor.c | 12 | ||||
| -rw-r--r-- | fb/wfbrename.h | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c index f4facbc37..53bfb14a2 100644 --- a/fb/fbpseudocolor.c +++ b/fb/fbpseudocolor.c @@ -143,10 +143,10 @@ typedef struct _xxGCPriv { (pGC)->devPrivates[xxGCPrivateIndex].ptr) #define xxGCPriv(pGC) xxGCPrivPtr pGCPriv = xxGetGCPriv(pGC) -int xxScrPrivateIndex = -1; -int xxGCPrivateIndex; -int xxColormapPrivateIndex = -1; -int xxGeneration; +static int xxScrPrivateIndex = -1; +static int xxGCPrivateIndex; +static int xxColormapPrivateIndex = -1; +static int xxGeneration; #define wrap(priv,real,mem,func) {\ @@ -1199,12 +1199,12 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy return TRUE; } -GCFuncs xxGCFuncs = { +static GCFuncs xxGCFuncs = { xxValidateGC, xxChangeGC, xxCopyGC, xxDestroyGC, xxChangeClip, xxDestroyClip, xxCopyClip }; -GCOps xxGCOps = { +static GCOps xxGCOps = { xxFillSpans, xxSetSpans, xxPutImage, xxCopyArea, xxCopyPlane, xxPolyPoint, diff --git a/fb/wfbrename.h b/fb/wfbrename.h index 9721bc607..4c3bc1785 100644 --- a/fb/wfbrename.h +++ b/fb/wfbrename.h @@ -187,3 +187,6 @@ #define fbWinPrivateIndex wfbWinPrivateIndex #define fbZeroLine wfbZeroLine #define fbZeroSegment wfbZeroSegment +#define xxPrintVisuals wfbxxPrintVisuals +#define xxSetup wfbxxSetup +#define composeFunctions wfbComposeFunctions |