# HG changeset patch # User darkvater # Date 1095175528 0 # Node ID 4f6f810464375bfe001d8ebc788a10b715e8aab8 # Parent 57a3922a029cf5f468435476434d8ac8efde0536 (svn r246) -Fix: 64bit machine warnings for sdl.c (Tron) diff -r 57a3922a029c -r 4f6f81046437 sdl.c --- a/sdl.c Tue Sep 14 14:26:12 2004 +0000 +++ b/sdl.c Tue Sep 14 15:25:28 2004 +0000 @@ -234,14 +234,15 @@ modes = SDL_CALL SDL_ListModes(NULL, SDL_SWSURFACE + (_fullscreen ? SDL_FULLSCREEN : 0)); - _all_modes = (int)modes == -1; + if(modes == NULL) + error("sdl: no modes available"); - if(!modes) { - error("sdl: no modes available"); - } else if((int) modes == -1) { + _all_modes = (modes == (void*)-1); + + if (_all_modes) { // all modes available, put some default ones here memcpy(_resolutions, default_resolutions, sizeof(default_resolutions)); - _num_resolutions = sizeof(default_resolutions) / (sizeof(uint16)*2); + _num_resolutions = lengthof(default_resolutions); } else { int n = 0; for(i = 0; modes[i]; i++) { @@ -257,12 +258,12 @@ if (j == n) { _resolutions[n][0] = w; _resolutions[n][1] = h; - if (++n == sizeof(_resolutions) / (sizeof(uint16)*2)) break; + if (++n == lengthof(_resolutions)) break; } } } _num_resolutions = n; - qsort(_resolutions, n, sizeof(uint16)*2, compare_res); + qsort(_resolutions, n, sizeof(_resolutions[0]), compare_res); } }