Removing function macro SDL_TABLESIZE()
This commit is contained in:
1 parent
8d0ad44edd
commit
7bfecacc02
10 files changed
+24
-14
No files matched your search
@@ -40,7 +40,7 @@ static SDL_Scancode keymap[KEYMAP_SIZE];
|
||||
static int8 keystate[KEYMAP_SIZE];
|
||||
|
||||
void HAIKU_InitOSKeymap(void) {
|
||||
for ( uint i = 0; i < SDL_TABLESIZE(keymap); ++i ) {
|
||||
for ( uint i = 0; i < SDL_arraysize(keymap); ++i ) {
|
||||
keymap[i] = SDL_SCANCODE_UNKNOWN;
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ void HAIKU_InitOSKeymap(void) {
|
||||
}
|
||||
|
||||
SDL_Scancode HAIKU_GetScancodeFromBeKey(int32 bkey) {
|
||||
if (bkey > 0 && bkey < (int32)SDL_TABLESIZE(keymap)) {
|
||||
if (bkey > 0 && bkey < (int32)SDL_arraysize(keymap)) {
|
||||
return keymap[bkey];
|
||||
} else {
|
||||
return SDL_SCANCODE_UNKNOWN;
|
||||
|
||||
@@ -48,7 +48,7 @@ static void *KMSDRM_GetSym(const char *fnname, int *pHasModule)
|
||||
{
|
||||
int i;
|
||||
void *fn = NULL;
|
||||
for (i = 0; i < SDL_TABLESIZE(kmsdrmlibs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(kmsdrmlibs); i++) {
|
||||
if (kmsdrmlibs[i].lib) {
|
||||
fn = SDL_LoadFunction(kmsdrmlibs[i].lib, fnname);
|
||||
if (fn) {
|
||||
@@ -97,7 +97,7 @@ void SDL_KMSDRM_UnloadSymbols(void)
|
||||
#include "SDL_kmsdrmsym.h"
|
||||
|
||||
#ifdef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC
|
||||
for (i = 0; i < SDL_TABLESIZE(kmsdrmlibs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(kmsdrmlibs); i++) {
|
||||
if (kmsdrmlibs[i].lib) {
|
||||
SDL_UnloadObject(kmsdrmlibs[i].lib);
|
||||
kmsdrmlibs[i].lib = NULL;
|
||||
@@ -118,7 +118,7 @@ int SDL_KMSDRM_LoadSymbols(void)
|
||||
#ifdef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC
|
||||
int i;
|
||||
int *thismod = NULL;
|
||||
for (i = 0; i < SDL_TABLESIZE(kmsdrmlibs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(kmsdrmlibs); i++) {
|
||||
if (kmsdrmlibs[i].libname) {
|
||||
kmsdrmlibs[i].lib = SDL_LoadObject(kmsdrmlibs[i].libname);
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ void PSP_InitOSKeymap(SDL_VideoDevice *_this)
|
||||
{
|
||||
#ifdef PSPIRKEYB
|
||||
int i;
|
||||
for (i = 0; i < SDL_TABLESIZE(keymap); ++i) {
|
||||
for (i = 0; i < SDL_arraysize(keymap); ++i) {
|
||||
keymap[i] = SDLK_UNKNOWN;
|
||||
}
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ void handleKeyboardEvent(screen_event_t event)
|
||||
}
|
||||
|
||||
// Skip unrecognized keys.
|
||||
if ((val < 0) || (val >= SDL_TABLESIZE(key_to_sdl))) {
|
||||
if ((val < 0) || (val >= SDL_arraysize(key_to_sdl))) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ void SDL_WAYLAND_UnloadSymbols(void)
|
||||
#include "SDL_waylandsym.h"
|
||||
|
||||
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
|
||||
for (i = 0; i < SDL_TABLESIZE(waylandlibs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(waylandlibs); i++) {
|
||||
if (waylandlibs[i].lib) {
|
||||
SDL_UnloadObject(waylandlibs[i].lib);
|
||||
waylandlibs[i].lib = NULL;
|
||||
@@ -132,7 +132,7 @@ int SDL_WAYLAND_LoadSymbols(void)
|
||||
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
|
||||
int i;
|
||||
int *thismod = NULL;
|
||||
for (i = 0; i < SDL_TABLESIZE(waylandlibs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(waylandlibs); i++) {
|
||||
if (waylandlibs[i].libname) {
|
||||
waylandlibs[i].lib = SDL_LoadObject(waylandlibs[i].libname);
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ static void *X11_GetSym(const char *fnname, int *pHasModule)
|
||||
{
|
||||
int i;
|
||||
void *fn = NULL;
|
||||
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(x11libs); i++) {
|
||||
if (x11libs[i].lib) {
|
||||
fn = SDL_LoadFunction(x11libs[i].lib, fnname);
|
||||
if (fn) {
|
||||
@@ -132,7 +132,7 @@ void SDL_X11_UnloadSymbols(void)
|
||||
#endif
|
||||
|
||||
#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
|
||||
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(x11libs); i++) {
|
||||
if (x11libs[i].lib) {
|
||||
SDL_UnloadObject(x11libs[i].lib);
|
||||
x11libs[i].lib = NULL;
|
||||
@@ -153,7 +153,7 @@ int SDL_X11_LoadSymbols(void)
|
||||
#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
|
||||
int i;
|
||||
int *thismod = NULL;
|
||||
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
|
||||
for (i = 0; i < SDL_arraysize(x11libs); i++) {
|
||||
if (x11libs[i].libname) {
|
||||
x11libs[i].lib = SDL_LoadObject(x11libs[i].libname);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user