diff options
author | 2016-11-11 14:34:46 +0100 | |
---|---|---|
committer | 2016-11-11 16:12:01 +0100 | |
commit | 7c765ea14785a4ad6efd2e30e03447f354bed6b4 (patch) | |
tree | 8c1e3836d1c907378f61bb5748aac4219af68ce4 /src/osd/modules/lib/osdlib_unix.cpp | |
parent | 5c0edceec3a939ce7804b23beaeebfc700413489 (diff) |
No need for osd_malloc, osd_malloc_array and osd_free (nw)
MALLOC_DEBUG not applicable anymore since we use new to allocate in 99.9% of cases
Diffstat (limited to 'src/osd/modules/lib/osdlib_unix.cpp')
-rw-r--r-- | src/osd/modules/lib/osdlib_unix.cpp | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/src/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp index 054c4591f71..f6e892455f8 100644 --- a/src/osd/modules/lib/osdlib_unix.cpp +++ b/src/osd/modules/lib/osdlib_unix.cpp @@ -56,47 +56,6 @@ void osd_process_kill() } //============================================================ -// osd_malloc -//============================================================ - -void *osd_malloc(size_t size) -{ -#ifndef MALLOC_DEBUG - return malloc(size); -#else -#error "MALLOC_DEBUG not yet supported" -#endif -} - - -//============================================================ -// osd_malloc_array -//============================================================ - -void *osd_malloc_array(size_t size) -{ -#ifndef MALLOC_DEBUG - return malloc(size); -#else -#error "MALLOC_DEBUG not yet supported" -#endif -} - - -//============================================================ -// osd_free -//============================================================ - -void osd_free(void *ptr) -{ -#ifndef MALLOC_DEBUG - free(ptr); -#else -#error "MALLOC_DEBUG not yet supported" -#endif -} - -//============================================================ // osd_alloc_executable // // allocates "size" bytes of executable memory. this must take @@ -160,7 +119,7 @@ char *osd_get_clipboard_text(void) if (SDL_HasClipboardText()) { char *temp = SDL_GetClipboardText(); - result = (char *) osd_malloc_array(strlen(temp) + 1); + result = (char *) malloc(strlen(temp) + 1); strcpy(result, temp); SDL_free(temp); } |