Fixes bug #2074 - Thanks Sylvain!

SDL_syssem.c:159 comparison of unsigned expression >= 0 is always true
Solved by comparing unsigneds directly

SDL_systimer.c:164: warning: control may reach end of Compile
Solved by returning the default value if all else fails.

SDL_androidgl.c:41:1: warning: type specifier missing, defaults to 'int'
SDL_androidgl.c:47:1: warning: control reaches end of non-void function
Solved by adding void return type to the function implementation
Gabriel Jacobo 2013-08-29 14:03:44 -03:00
parent e07d7e649c
commit eec4710c53
3 changed files with 5 additions and 4 deletions

View File

@ -156,7 +156,7 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
#else
end = SDL_GetTicks() + timeout;
while ((retval = SDL_SemTryWait(sem)) == SDL_MUTEX_TIMEDOUT) {
if ((SDL_GetTicks() - end) >= 0) {
if (SDL_GetTicks() >= end) {
break;
}
SDL_Delay(0);

View File

@ -158,9 +158,9 @@ SDL_GetPerformanceFrequency(void)
freq /= mach_base_info.numer;
return freq;
#endif
} else {
return 1000000;
}
return 1000000;
}
void

View File

@ -38,6 +38,7 @@
SDL_EGL_CreateContext_impl(Android)
SDL_EGL_MakeCurrent_impl(Android)
void
Android_GLES_SwapWindow(_THIS, SDL_Window * window)
{
/* FIXME: These two functions were in the Java code, do we really need them? */