From d16e83413e7e06adebd629d04de57bbedd8c3765 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Wed, 20 Sep 2006 12:47:17 -0700
Subject: [PATCH] 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.
---
 fb/fbpseudocolor.c | 12 ++++++------
 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