1 files changed, 7 insertions, 5 deletions
diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c
index 191769f54..506b5c4c8 100644
--- a/xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c
+++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c
@@ -1,15 +1,17 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c,v 1.3 2002/09/18 17:11:40 tsi Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c,v 1.5 2002/11/05 17:46:07 tsi Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "glheader.h"
+#include "colormac.h"
 #include "macros.h"
 #include "mtypes.h"
 #include "simple_list.h"
 #include "enums.h"
 
 #include "mm.h"
+#include "glint_dri.h"
 #include "gamma_context.h"
 #include "gamma_lock.h"
 
@@ -321,7 +323,7 @@ void gammaPrintLocalLRU( gammaContextPtr gmesa )
 void gammaPrintGlobalLRU( gammaContextPtr gmesa )
 {
    int i, j;
-   drm_gamma_tex_region_t *list = gmesa->sarea->texList;
+   GAMMATextureRegionPtr list = gmesa->sarea->texList;
 
    for (i = 0, j = GAMMA_NR_TEX_REGIONS ; i < GAMMA_NR_TEX_REGIONS ; i++) {
       fprintf(stderr, "list[%d] age %d next %d prev %d\n",
@@ -337,7 +339,7 @@ void gammaPrintGlobalLRU( gammaContextPtr gmesa )
 
 void gammaResetGlobalLRU( gammaContextPtr gmesa )
 {
-   drm_gamma_tex_region_t *list = gmesa->sarea->texList;
+   GAMMATextureRegionPtr list = gmesa->sarea->texList;
    int sz = 1 << gmesa->gammaScreen->logTextureGranularity;
    int i;
 
@@ -369,7 +371,7 @@ void gammaUpdateTexLRU( gammaContextPtr gmesa, gammaTextureObjectPtr t )
    int logsz = gmesa->gammaScreen->logTextureGranularity;
    int start = t->MemBlock->ofs >> logsz;
    int end = (t->MemBlock->ofs + t->MemBlock->size - 1) >> logsz;
-   drm_gamma_tex_region_t *list = gmesa->sarea->texList;
+   GAMMATextureRegionPtr list = gmesa->sarea->texList;
 
    gmesa->texAge = ++gmesa->sarea->texAge;
 
@@ -502,7 +504,7 @@ void gammaUploadTexImages( gammaContextPtr gmesa, gammaTextureObjectPtr t )
       }
 
       ofs = t->MemBlock->ofs;
-      t->BufAddr = (char *)(long)(gmesa->LBWindowBase + ofs);	/* ??? */
+      t->BufAddr = (char *)(unsigned long)(gmesa->LBWindowBase + ofs); /* ??? */
 
       if (t == gmesa->CurrentTexObj[0])
 	 gmesa->dirty |= GAMMA_UPLOAD_TEX0;