From 59397be54f27de64f7fce1d1b57a9951fa5bc43b Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 1 Mar 2019 23:54:52 -0500 Subject: [PATCH] Fix a few calls from SDL_ to SDL20_. --- src/SDL12_compat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c index bfb6be250..9976467cd 100644 --- a/src/SDL12_compat.c +++ b/src/SDL12_compat.c @@ -3176,12 +3176,12 @@ SDL_GL_LoadLibrary(const char *libname) } /* reset the actual error. */ - char *dup = SDL_strdup(err); + char *dup = SDL20_strdup(err); if (!dup) { - SDL20_SetError("Out of memory"); + SDL20_OutOfMemory(); } else { SDL20_SetError(dup); - SDL_free(dup); + SDL20_free(dup); } } return rc; @@ -3696,9 +3696,9 @@ SDL_OpenAudio(SDL_AudioSpec *want, SDL_AudioSpec *obtained) return SDL20_SetError("Callback can't be NULL"); } - AudioCallbackWrapperData *data = (AudioCallbackWrapperData *) SDL_calloc(1, sizeof (AudioCallbackWrapperData)); + AudioCallbackWrapperData *data = (AudioCallbackWrapperData *) SDL20_calloc(1, sizeof (AudioCallbackWrapperData)); if (!data) { - return SDL20_SetError("Out of memory"); + return SDL20_OutOfMemory(); } data->app_callback = want->callback; data->app_userdata = want->userdata; @@ -3711,7 +3711,7 @@ SDL_OpenAudio(SDL_AudioSpec *want, SDL_AudioSpec *obtained) want->callback = data->app_callback; want->userdata = data->app_userdata; if (retval == -1) { - SDL_free(data); + SDL20_free(data); } else { FIXME("memory leak on callback data"); if (!obtained) {