Commit 81b8c57f authored by Sam Lantinga's avatar Sam Lantinga

Fixed compile warnings with gcc 4

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401199
parent eb508c4b
...@@ -116,7 +116,7 @@ static int SDL_SoftBlit(SDL_Surface *src, SDL_Rect *srcrect, ...@@ -116,7 +116,7 @@ static int SDL_SoftBlit(SDL_Surface *src, SDL_Rect *srcrect,
} }
#ifdef MMX_ASMBLIT #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; int i;
...@@ -132,7 +132,7 @@ static __inline__ void SDL_memcpyMMX(char* to,char* from,int len) ...@@ -132,7 +132,7 @@ static __inline__ void SDL_memcpyMMX(char* to,char* from,int len)
SDL_memcpy(to, from, len&7); 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; int i;
......
...@@ -613,7 +613,7 @@ void X11_InitKeymap(void) ...@@ -613,7 +613,7 @@ void X11_InitKeymap(void)
} }
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
Uint32 Utf8ToUcs4(const char * utf8) Uint32 Utf8ToUcs4(const unsigned char *utf8)
{ {
Uint32 c; Uint32 c;
int i = 1; int i = 1;
......
...@@ -532,7 +532,7 @@ void *X11_GL_GetProcAddress(_THIS, const char* proc) ...@@ -532,7 +532,7 @@ void *X11_GL_GetProcAddress(_THIS, const char* proc)
handle = this->gl_config.dll_handle; handle = this->gl_config.dll_handle;
if ( this->gl_data->glXGetProcAddress ) { if ( this->gl_data->glXGetProcAddress ) {
return this->gl_data->glXGetProcAddress(proc); return this->gl_data->glXGetProcAddress((const GLubyte *)proc);
} }
#if defined(__OpenBSD__) && !defined(__ELF__) #if defined(__OpenBSD__) && !defined(__ELF__)
#undef do_dlsym #undef do_dlsym
......
...@@ -49,7 +49,7 @@ static char rcsid = ...@@ -49,7 +49,7 @@ static char rcsid =
Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info) Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info)
{ {
SDL_NAME(XF86VidModeModeLine) *l = (SDL_NAME(XF86VidModeModeLine)*)((char*)info + sizeof info->dotclock); 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 */ #endif /* XFREE86_VM */
......
...@@ -103,8 +103,8 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S ...@@ -103,8 +103,8 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
SDL_Overlay *overlay; SDL_Overlay *overlay;
struct private_yuvhwdata *hwdata; struct private_yuvhwdata *hwdata;
int xv_port; int xv_port;
int i, j, k; unsigned int i, j, k;
int adaptors; unsigned int adaptors;
SDL_NAME(XvAdaptorInfo) *ainfo; SDL_NAME(XvAdaptorInfo) *ainfo;
int bpp; int bpp;
#ifndef NO_SHARED_MEMORY #ifndef NO_SHARED_MEMORY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment