From aba4b033c348ce8747b98898acbb1b6fb2f062ad Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Fri, 15 Oct 2021 10:15:00 +0300 Subject: [PATCH] make things work against SDL-2.0.9 at run time. --- src/SDL12_compat.c | 10 ++++++++++ src/SDL20_syms.h | 6 ------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c index 6bde98d14..403dc845d 100644 --- a/src/SDL12_compat.c +++ b/src/SDL12_compat.c @@ -6383,6 +6383,16 @@ SDL_LoadWAV_RW(SDL12_RWops *rwops12, int freerwops12, #include "dr_mp3.h" +static SDL_INLINE Sint64 SDLCALL SDL20_RWseek(SDL_RWops *ctx, Sint64 ofs, int whence) { + return ctx->seek(ctx, ofs, whence); +} +static SDL_INLINE size_t SDLCALL SDL20_RWread(SDL_RWops *ctx, void *ptr, size_t size, size_t n) { + return ctx->read(ctx, ptr, size, n); +} +static SDL_INLINE int SDLCALL SDL20_RWclose(SDL_RWops *ctx) { + return ctx->close(ctx); +} + static size_t mp3_sdlrwops_read(void *data, void *buf, size_t bytesToRead) { diff --git a/src/SDL20_syms.h b/src/SDL20_syms.h index f1cb7850b..374b2cc66 100644 --- a/src/SDL20_syms.h +++ b/src/SDL20_syms.h @@ -253,12 +253,6 @@ SDL20_SYM(SDL_RWops *,RWFromMem,(void *a, int b),(a,b),return) SDL20_SYM(SDL_RWops *,RWFromConstMem,(const void *a, int b),(a,b),return) SDL20_SYM(SDL_RWops *,AllocRW,(void),(),return) SDL20_SYM(void,FreeRW,(SDL_RWops *a),(a),) -SDL20_SYM(Sint64,RWsize,(SDL_RWops *a),(a),return) -SDL20_SYM(Sint64,RWseek,(SDL_RWops *a, Sint64 b, int c),(a,b,c),return) -SDL20_SYM(Sint64,RWtell,(SDL_RWops *a),(a),return) -SDL20_SYM(size_t,RWread,(SDL_RWops *a, void *b, size_t c, size_t d),(a,b,c,d),return) -SDL20_SYM(size_t,RWwrite,(SDL_RWops *a, const void *b, size_t c, size_t d),(a,b,c,d),return) -SDL20_SYM(int,RWclose,(SDL_RWops *a),(a),return) SDL20_SYM_PASSTHROUGH(void *,malloc,(size_t a),(a),return) SDL20_SYM_PASSTHROUGH(void *,calloc,(size_t a, size_t b),(a,b),return)