[PATCH xf86-video-savage 2/2] Eliminate unused variable compilation warnings

[Kevin Brace]

Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
---
 src/savage_dri.c    | 17 -----------------
 src/savage_driver.c |  2 +-
 src/savage_video.c  |  6 ++++++
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/savage_dri.c b/src/savage_dri.c
index 2d79943..e8a461b 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -54,23 +54,6 @@
 #include "savage_dri.h"
 #include "savage_sarea.h"
 
-static struct {
-   int bpp;
-   int redSize;
-   int greenSize;
-   int blueSize;
-   int alphaSize;
-   int redMask;
-   int greenMask;
-   int blueMask;
-   int alphaMask;
-   int depthSize;
-} SAVAGEVisuals[] = {
-   { 16, 5, 6, 5, 0, 0x0000F800, 0x000007E0, 0x0000001F, 0, 16 },
-   { 32, 8, 8, 8, 0, 0x00FF0000, 0x0000FF00, 0x000000FF, 0, 24 },
-   {  0, 0, 0, 0, 0,          0,          0,          0, 0,  0 }
-};
-
 static char SAVAGEKernelDriverName[] = "savage";
 static char SAVAGEClientDriverName[] = "savage";
 
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 3cda923..01fc0bc 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1265,8 +1265,8 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
 
     if(!psav->NoAccel) {
         from = X_DEFAULT;
-	char *strptr;
 #ifdef HAVE_XAA_H
+        char *strptr;
         if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
 	    if(!xf86NameCmp(strptr,"XAA")) {
 	        from = X_CONFIG;
diff --git a/src/savage_video.c b/src/savage_video.c
index bc19bc7..c88317c 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -1037,7 +1037,9 @@ static void
 SavageStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
 {
     SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
+#ifdef SAVAGEDRI
     SavagePtr psav = SAVPTR(pScrn);
+#endif
 
     xf86ErrorFVerb(XVTRACE,"SavageStopVideo\n");
 
@@ -1777,7 +1779,9 @@ SavageDisplayVideo2000(
     short drw_w, short drw_h
 ){
     SavagePtr psav = SAVPTR(pScrn);
+#if 0
     vgaHWPtr hwp = VGAHWPTR(pScrn);
+#endif
     /*DisplayModePtr mode = pScrn->currentMode;*/
     SavagePortPrivPtr pPriv = psav->adaptor->pPortPrivates[0].ptr;
 #if 0
@@ -1909,7 +1913,9 @@ SavagePutImage(
 ){
     SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
     SavagePtr psav = SAVPTR(pScrn);
+#ifdef SAVAGEDRI
     ScreenPtr pScreen = pScrn->pScreen;
+#endif
     INT32 x1, x2, y1, y2;
     unsigned char *dst_start;
     int new_size, offset, offsetV=0, offsetU=0;
-- 
2.7.4