early-access version 2847

externals/SDL/src/stdlib/SDL_malloc.c

@@ -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 * SDLCALL dlmalloc(size_t);
+    void *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 SDLCALL dlfree(void *);
+    void 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 * SDLCALL dlcalloc(size_t, size_t);
+    void *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 * SDLCALL dlrealloc(void *, size_t);
+    void *dlrealloc(void *, size_t);
 
 /*
   memalign(size_t alignment, size_t n);
@@ -5305,10 +5305,10 @@ History:
 #endif /* !HAVE_MALLOC */
 
 #ifdef HAVE_MALLOC
-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); }
+#define real_malloc malloc
+#define real_calloc calloc
+#define real_realloc realloc
+#define real_free free
 #else
 #define real_malloc dlmalloc
 #define real_calloc dlcalloc