TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-18 11:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

* Adjustment: Update libsdl to address a bug in compilation on MacOS devices.

Browse source
This commit is contained in:
Robert MacGregor 2022-05-21 20:25:30 -04:00
parent 516163fd5d
commit eab544c8f3
270 changed files with 9531 additions and 3704 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/lib/sdl/src/stdlib/SDL_malloc.c
View file

@ -733,7 +733,7 @@ extern "C"
maximum supported value of n differs across systems, but is in all
cases less than the maximum representable value of a size_t.
*/
void *dlmalloc(size_t);
void * SDLCALL dlmalloc(size_t);
/*
free(void* p)
@ -742,14 +742,14 @@ extern "C"
It has no effect if p is null. If p was not malloced or already
freed, free(p) will by default cause the current program to abort.
*/
void dlfree(void *);
void SDLCALL dlfree(void *);
/*
calloc(size_t n_elements, size_t element_size);
Returns a pointer to n_elements * element_size bytes, with all locations
set to zero.
*/
void *dlcalloc(size_t, size_t);
void * SDLCALL dlcalloc(size_t, size_t);
/*
realloc(void* p, size_t n)
@ -774,7 +774,7 @@ extern "C"
to be used as an argument to realloc is not supported.
*/
void *dlrealloc(void *, size_t);
void * SDLCALL dlrealloc(void *, size_t);
/*
memalign(size_t alignment, size_t n);
@ -5305,10 +5305,10 @@ History:
#endif /* !HAVE_MALLOC */
#ifdef HAVE_MALLOC
#define real_malloc malloc
#define real_calloc calloc
#define real_realloc realloc
#define real_free free
static void* SDLCALL real_malloc(size_t s) { return malloc(s); }
static void* SDLCALL real_calloc(size_t n, size_t s) { return calloc(n, s); }
static void* SDLCALL real_realloc(void *p, size_t s) { return realloc(p,s); }
static void SDLCALL real_free(void *p) { free(p); }
#else
#define real_malloc dlmalloc
#define real_calloc dlcalloc