From 4a974761580f148a79675c7c11198f818df88b2e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 30 Jun 2007 03:47:50 +0000 Subject: [PATCH] Fixed 64-bit compile issues --- src/video/fbcon/SDL_fb3dfx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/video/fbcon/SDL_fb3dfx.c b/src/video/fbcon/SDL_fb3dfx.c index dca9f7339..91df7acff 100644 --- a/src/video/fbcon/SDL_fb3dfx.c +++ b/src/video/fbcon/SDL_fb3dfx.c @@ -52,7 +52,7 @@ static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key) static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) { int bpp; - char *dst_base; + Uint32 dst_base; Uint32 format; int dstX, dstY; @@ -65,7 +65,7 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) } /* Set the destination pixel format */ - dst_base = (char *)((char *)dst->pixels - mapped_mem); + dst_base = ((char *)dst->pixels - mapped_mem); bpp = dst->format->BitsPerPixel; format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13); @@ -75,7 +75,7 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) /* Execute the fill command */ tdfx_wait(6); - tdfx_out32(DSTBASE, (Uint32)dst_base); + tdfx_out32(DSTBASE, dst_base); tdfx_out32(DSTFORMAT, format); tdfx_out32(COLORFORE, color); tdfx_out32(COMMAND_2D, COMMAND_2D_FILLRECT); @@ -97,8 +97,8 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect, int bpp; Uint32 src_format; Uint32 dst_format; - char *src_base; - char *dst_base; + Uint32 src_base; + Uint32 dst_base; int srcX, srcY; int dstX, dstY; Uint32 blitop; @@ -113,10 +113,10 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect, } /* Set the source and destination pixel format */ - src_base = (char *)((char *)src->pixels - mapped_mem); + src_base = ((char *)src->pixels - mapped_mem); bpp = src->format->BitsPerPixel; src_format = src->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13); - dst_base = (char *)((char *)dst->pixels - mapped_mem); + dst_base = ((char *)dst->pixels - mapped_mem); bpp = dst->format->BitsPerPixel; dst_format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13);