Fixed 64-bit compile issues SDL-1.2
authorSam Lantinga
Sat, 30 Jun 2007 03:47:50 +0000
branchSDL-1.2
changeset 3989f903dc168217
parent 3988 3270e88063a2
child 3990 1164b2b282a2
Fixed 64-bit compile issues
src/video/fbcon/SDL_fb3dfx.c
     1.1 --- a/src/video/fbcon/SDL_fb3dfx.c	Thu Jun 28 19:29:26 2007 +0000
     1.2 +++ b/src/video/fbcon/SDL_fb3dfx.c	Sat Jun 30 03:47:50 2007 +0000
     1.3 @@ -52,7 +52,7 @@
     1.4  static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
     1.5  {
     1.6  	int bpp;
     1.7 -	char *dst_base;
     1.8 +	Uint32 dst_base;
     1.9  	Uint32 format;
    1.10  	int dstX, dstY;
    1.11  
    1.12 @@ -65,7 +65,7 @@
    1.13  	}
    1.14  
    1.15  	/* Set the destination pixel format */
    1.16 -	dst_base = (char *)((char *)dst->pixels - mapped_mem);
    1.17 +	dst_base = ((char *)dst->pixels - mapped_mem);
    1.18  	bpp = dst->format->BitsPerPixel;
    1.19  	format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13);
    1.20  
    1.21 @@ -75,7 +75,7 @@
    1.22  
    1.23  	/* Execute the fill command */
    1.24  	tdfx_wait(6);
    1.25 -	tdfx_out32(DSTBASE, (Uint32)dst_base);
    1.26 +	tdfx_out32(DSTBASE, dst_base);
    1.27  	tdfx_out32(DSTFORMAT, format);
    1.28  	tdfx_out32(COLORFORE, color);
    1.29  	tdfx_out32(COMMAND_2D, COMMAND_2D_FILLRECT);
    1.30 @@ -97,8 +97,8 @@
    1.31  	int bpp;
    1.32  	Uint32 src_format;
    1.33  	Uint32 dst_format;
    1.34 -	char *src_base;
    1.35 -	char *dst_base;
    1.36 +	Uint32 src_base;
    1.37 +	Uint32 dst_base;
    1.38  	int srcX, srcY;
    1.39  	int dstX, dstY;
    1.40  	Uint32 blitop;
    1.41 @@ -113,10 +113,10 @@
    1.42  	}
    1.43  
    1.44  	/* Set the source and destination pixel format */
    1.45 -	src_base = (char *)((char *)src->pixels - mapped_mem);
    1.46 +	src_base = ((char *)src->pixels - mapped_mem);
    1.47  	bpp = src->format->BitsPerPixel;
    1.48  	src_format = src->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13);
    1.49 -	dst_base = (char *)((char *)dst->pixels - mapped_mem);
    1.50 +	dst_base = ((char *)dst->pixels - mapped_mem);
    1.51  	bpp = dst->format->BitsPerPixel;
    1.52  	dst_format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13);
    1.53