Mercurial > sdl-ios-xcode
changeset 1196:b81f54c3963f
Fixed compile warnings with gcc 4
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 08 Dec 2005 14:21:17 +0000 |
| parents | bb6791b0a268 |
| children | bb5ace455586 |
| files | src/video/SDL_blit.c src/video/x11/SDL_x11events.c src/video/x11/SDL_x11gl.c src/video/x11/SDL_x11modes.c src/video/x11/SDL_x11yuv.c |
| diffstat | 5 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/SDL_blit.c Tue Dec 06 14:36:39 2005 +0000 +++ b/src/video/SDL_blit.c Thu Dec 08 14:21:17 2005 +0000 @@ -116,7 +116,7 @@ } #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; @@ -132,7 +132,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;
--- a/src/video/x11/SDL_x11events.c Tue Dec 06 14:36:39 2005 +0000 +++ b/src/video/x11/SDL_x11events.c Thu Dec 08 14:21:17 2005 +0000 @@ -613,7 +613,7 @@ } #ifdef X_HAVE_UTF8_STRING -Uint32 Utf8ToUcs4(const char * utf8) +Uint32 Utf8ToUcs4(const unsigned char *utf8) { Uint32 c; int i = 1;
--- a/src/video/x11/SDL_x11gl.c Tue Dec 06 14:36:39 2005 +0000 +++ b/src/video/x11/SDL_x11gl.c Thu Dec 08 14:21:17 2005 +0000 @@ -532,7 +532,7 @@ 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
--- a/src/video/x11/SDL_x11modes.c Tue Dec 06 14:36:39 2005 +0000 +++ b/src/video/x11/SDL_x11modes.c Thu Dec 08 14:21:17 2005 +0000 @@ -49,7 +49,7 @@ 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 */
--- a/src/video/x11/SDL_x11yuv.c Tue Dec 06 14:36:39 2005 +0000 +++ b/src/video/x11/SDL_x11yuv.c Thu Dec 08 14:21:17 2005 +0000 @@ -103,8 +103,8 @@ 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