Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed compile warnings with gcc 4
  • Loading branch information
slouken committed Dec 8, 2005
1 parent 34fc4ff commit f174706
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/video/SDL_blit.c
Expand Up @@ -116,7 +116,7 @@ static int SDL_SoftBlit(SDL_Surface *src, SDL_Rect *srcrect,
}

#ifdef MMX_ASMBLIT
static __inline__ void SDL_memcpyMMX(char* to,char* from,int len)
static __inline__ void SDL_memcpyMMX(Uint8 *to, const Uint8 *from, int len)
{
int i;

Expand All @@ -132,7 +132,7 @@ static __inline__ void SDL_memcpyMMX(char* to,char* from,int len)
SDL_memcpy(to, from, len&7);
}

static __inline__ void SDL_memcpySSE(char* to,char* from,int len)
static __inline__ void SDL_memcpySSE(Uint8 *to, const Uint8 *from, int len)
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion src/video/x11/SDL_x11events.c
Expand Up @@ -613,7 +613,7 @@ void X11_InitKeymap(void)
}

#ifdef X_HAVE_UTF8_STRING
Uint32 Utf8ToUcs4(const char * utf8)
Uint32 Utf8ToUcs4(const unsigned char *utf8)
{
Uint32 c;
int i = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/video/x11/SDL_x11gl.c
Expand Up @@ -532,7 +532,7 @@ void *X11_GL_GetProcAddress(_THIS, const char* proc)

handle = this->gl_config.dll_handle;
if ( this->gl_data->glXGetProcAddress ) {
return this->gl_data->glXGetProcAddress(proc);
return this->gl_data->glXGetProcAddress((const GLubyte *)proc);
}
#if defined(__OpenBSD__) && !defined(__ELF__)
#undef do_dlsym
Expand Down
2 changes: 1 addition & 1 deletion src/video/x11/SDL_x11modes.c
Expand Up @@ -49,7 +49,7 @@ static char rcsid =
Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info)
{
SDL_NAME(XF86VidModeModeLine) *l = (SDL_NAME(XF86VidModeModeLine)*)((char*)info + sizeof info->dotclock);
return SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, &info->dotclock, l);
return SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, (int*)&info->dotclock, l);
}
#endif /* XFREE86_VM */

Expand Down
4 changes: 2 additions & 2 deletions src/video/x11/SDL_x11yuv.c
Expand Up @@ -103,8 +103,8 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
SDL_Overlay *overlay;
struct private_yuvhwdata *hwdata;
int xv_port;
int i, j, k;
int adaptors;
unsigned int i, j, k;
unsigned int adaptors;
SDL_NAME(XvAdaptorInfo) *ainfo;
int bpp;
#ifndef NO_SHARED_MEMORY
Expand Down

0 comments on commit f174706

Please sign in to comment.