summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/osd/sdl/main.c3
-rw-r--r--src/osd/sdl/sdlprefix.h20
2 files changed, 2 insertions, 21 deletions
diff --git a/src/osd/sdl/main.c b/src/osd/sdl/main.c
index ea9c4ed8a9f..6d967d48e82 100644
--- a/src/osd/sdl/main.c
+++ b/src/osd/sdl/main.c
@@ -14,6 +14,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tchar.h>
+#include <stdlib.h>
// MAMEOS headers
#include "strconv.h"
@@ -59,7 +60,7 @@ extern "C" int _tmain(int argc, TCHAR **argv)
/* free arguments */
for (i = 0; i < argc; i++)
- osd_free(utf8_argv[i]);
+ free(utf8_argv[i]);
osd_free(utf8_argv);
#ifdef MALLOC_DEBUG
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index 866bed428db..b16d3f4d3c4 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -56,26 +56,6 @@
#endif /* SDLMAME_UNIX */
-//============================================================
-// malloc debugging
-//============================================================
-
-#ifdef MALLOC_DEBUG
-#include <stdlib.h>
-
-// override malloc to track file/line
-void* malloc_file_line(size_t size, const char *file, int line);
-void* calloc_file_line(size_t size, size_t count, const char *FILE, int line);
-void * realloc_file_line(void *memory, size_t size, const char *file, int line);
-
-#undef malloc
-#define malloc(x) malloc_file_line(x, __FILE__, __LINE__)
-#undef calloc
-#define calloc(x,y) calloc_file_line(x, y, __FILE__, __LINE__)
-#undef realloc
-#define realloc(x,y) realloc_file_line(x, y, __FILE__, __LINE__)
-#endif
-
#ifdef _MSC_VER
void *__cdecl _alloca(size_t);
#define alloca _alloca