summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2010-01-17 19:27:03 +0000
committer Couriersud <couriersud@users.noreply.github.com>2010-01-17 19:27:03 +0000
commit269e2cf4fcf1cda818baf6dc3c40d86cd356bf31 (patch)
treeaafd2cbb5328faf308a92f2fd194763fc8b8acce /src
parent89d20f98666d8b9b0a6666d8aa62151091ce6f99 (diff)
Removed stdlib.h from osdcomm.h.
- Added #include stdlib.h where now necessary Fixed Solaris build Fixed building unidasm for OSD=sdl on win32
Diffstat (limited to 'src')
-rw-r--r--src/osd/osdcomm.h2
-rw-r--r--src/osd/sdl/SDLMain_tmpl.m2
-rw-r--r--src/osd/sdl/main.c6
-rw-r--r--src/osd/sdl/sdl.mak20
-rw-r--r--src/osd/sdl/sdldir.c8
-rw-r--r--src/osd/sdl/sdlfile.c6
-rw-r--r--src/osd/sdl/sdlmain.c2
-rw-r--r--src/osd/sdl/sdlos_unix.c4
-rw-r--r--src/osd/sdl/sdlprefix.h12
-rw-r--r--src/osd/sdl/sdlwork.c3
-rw-r--r--src/osd/windows/main.c1
-rw-r--r--src/osd/windows/winfile.c1
-rw-r--r--src/osd/windows/winsync.c1
-rw-r--r--src/osd/windows/winutf8.c1
-rw-r--r--src/osd/windows/winwork.c1
15 files changed, 54 insertions, 16 deletions
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index 3b19e11f9c8..d6e4d219e7a 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -45,7 +45,7 @@
#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
+//#include <stdlib.h>
/***************************************************************************
diff --git a/src/osd/sdl/SDLMain_tmpl.m b/src/osd/sdl/SDLMain_tmpl.m
index e2e302b0b53..21c1ff2f1f8 100644
--- a/src/osd/sdl/SDLMain_tmpl.m
+++ b/src/osd/sdl/SDLMain_tmpl.m
@@ -269,7 +269,7 @@ static void CustomApplicationMain (int argc, char **argv)
if (arg == NULL)
return FALSE;
- newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
+ newargv = (char **) SDL_realloc(gArgv, sizeof (char *) * (gArgc + 2));
if (newargv == NULL)
{
SDL_free(arg);
diff --git a/src/osd/sdl/main.c b/src/osd/sdl/main.c
index d6a7b3bc139..ea9c4ed8a9f 100644
--- a/src/osd/sdl/main.c
+++ b/src/osd/sdl/main.c
@@ -44,7 +44,7 @@ extern "C" int _tmain(int argc, TCHAR **argv)
#endif
/* convert arguments to UTF-8 */
- utf8_argv = (char **) malloc(argc * sizeof(*argv));
+ utf8_argv = (char **) osd_malloc(argc * sizeof(*argv));
if (utf8_argv == NULL)
return 999;
for (i = 0; i < argc; i++)
@@ -59,8 +59,8 @@ extern "C" int _tmain(int argc, TCHAR **argv)
/* free arguments */
for (i = 0; i < argc; i++)
- free(utf8_argv[i]);
- free(utf8_argv);
+ osd_free(utf8_argv[i]);
+ osd_free(utf8_argv);
#ifdef MALLOC_DEBUG
{
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 5c8b7fb0572..1e65706005e 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -65,6 +65,7 @@ endif
# GTK_INSTALL_ROOT = y:/couriersud/win/gtk-32
+
###########################################################################
################## END USER-CONFIGURABLE OPTIONS ######################
###########################################################################
@@ -154,7 +155,7 @@ endif
ifeq ($(TARGETOS),solaris)
BASE_TARGETOS = unix
-DEFS += -DNO_AFFINITY_NP
+DEFS += -DNO_AFFINITY_NP -UHAVE_VSNPRINTF -DNO_vsnprintf
SYNC_IMPLEMENTATION = tc
endif
@@ -198,6 +199,8 @@ SYNC_IMPLEMENTATION = win32
NO_X11 = 1
DEFS += -DSDLMAME_WIN32 -DX64_WINDOWS_ABI
LIBGL = -lopengl32
+# needed for unidasm
+LDFLAGS += -Wl,--allow-multiple-definition
# do we have GTK ?
ifndef GTK_INSTALL_ROOT
@@ -492,7 +495,7 @@ testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL) $(LIBOCORE) $(SDLUTILMAIN)
#-------------------------------------------------
$(OSDCLEAN):
- rm -f .depend_*
+ @rm -f .depend_*
#-------------------------------------------------
# various support targets
@@ -511,19 +514,18 @@ EXCLUDES = -x "*/.svn/*"
zip:
zip -rq ../mame_$(BUILD_VERSION).zip $(DISTFILES) $(EXCLUDES)
-DEPEND = .depend_$(EMULATOR)
+DEPENDFILE = .depend_$(EMULATOR)
-$(DEPEND):
- rm -f $(DEPEND)
+makedepend:
+ @echo Generating $(DEPENDFILE)
+ rm -f $(DEPENDFILE)
@for i in `find src -name "*.c"` ; do \
echo processing $$i; \
mt=`echo $$i | sed -e "s/\\.c/\\.o/" -e "s!^src/!$(OBJ)/!"` ; \
g++ -MM -MT $$mt $(CDEFS) $(CCOMFLAGS) $$i 2>/dev/null \
- | sed -e "s!$$i!!g" >> $(DEPEND) ; \
+ | sed -e "s!$$i!!g" >> $(DEPENDFILE) ; \
done
-depend: $(DEPEND)
-
--include $(DEPEND)
+-include $(DEPENDFILE)
endif
diff --git a/src/osd/sdl/sdldir.c b/src/osd/sdl/sdldir.c
index 0236f769036..ed9705a4317 100644
--- a/src/osd/sdl/sdldir.c
+++ b/src/osd/sdl/sdldir.c
@@ -9,11 +9,17 @@
//
//============================================================
+#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
+#endif
+
#ifdef SDLMAME_LINUX
#define __USE_LARGEFILE64
#endif
#ifndef SDLMAME_BSD
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
#define _XOPEN_SOURCE 500
#endif
@@ -70,7 +76,7 @@ static osd_dir_entry_type get_attributes_stat(const char *file)
#else
struct stat64 st;
if(stat64(file, &st))
- return 0;
+ return ENTTYPE_NONE;
#endif
#ifdef SDLMAME_WIN32
diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c
index 40dab6a040c..51afed76d92 100644
--- a/src/osd/sdl/sdlfile.c
+++ b/src/osd/sdl/sdlfile.c
@@ -9,11 +9,17 @@
//
//============================================================
+#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
+#endif
+
#ifdef SDLMAME_LINUX
#define __USE_LARGEFILE64
#endif
#ifndef SDLMAME_BSD
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
#define _XOPEN_SOURCE 500
#endif
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c
index a3e9077fcaa..4d07878dcf0 100644
--- a/src/osd/sdl/sdlmain.c
+++ b/src/osd/sdl/sdlmain.c
@@ -262,7 +262,7 @@ static int setenv(const char *name, const char *value, int overwrite)
if (getenv(name) != NULL)
return 0;
}
- buf = (char *) malloc(strlen(name)+strlen(value)+2);
+ buf = (char *) osd_malloc(strlen(name)+strlen(value)+2);
sprintf(buf, "%s=%s", name, value);
result = putenv(buf);
diff --git a/src/osd/sdl/sdlos_unix.c b/src/osd/sdl/sdlos_unix.c
index e38111bc28c..e7551ee0d6a 100644
--- a/src/osd/sdl/sdlos_unix.c
+++ b/src/osd/sdl/sdlos_unix.c
@@ -127,7 +127,11 @@ void *osd_alloc_executable(size_t size)
void osd_free_executable(void *ptr, size_t size)
{
+#ifdef SDLMAME_SOLARIS
+ munmap((char *)ptr, size);
+#else
munmap(ptr, size);
+#endif
}
//============================================================
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index 5f93da06071..0fc1ab6be8c 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -27,6 +27,18 @@
#if defined(__sun__) && defined(__svr4__)
#define SDLMAME_SOLARIS 1
+//#undef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE_EXTENDED
+#undef _XPG6
+#undef _XPG5
+#undef _XPG4_2
+
+#if 1
+#undef _XOPEN_SOURCE
+#undef _XOPEN_VERSION
+#define _XOPEN_SOURCE
+#define _XOPEN_VERSION 4
+#endif
#elif defined(__irix__) || defined(__sgi)
#define SDLMAME_IRIX 1
diff --git a/src/osd/sdl/sdlwork.c b/src/osd/sdl/sdlwork.c
index ce0920cab55..ec5888c7688 100644
--- a/src/osd/sdl/sdlwork.c
+++ b/src/osd/sdl/sdlwork.c
@@ -22,6 +22,9 @@ int sdl_num_processors = 0;
#else
+// FIXME: remove this after malloc->osd_malloc
+#include <stdlib.h>
+
#include "osdcore.h"
#include "osinline.h"
diff --git a/src/osd/windows/main.c b/src/osd/windows/main.c
index 0d028ebb692..4e41c1ae1ac 100644
--- a/src/osd/windows/main.c
+++ b/src/osd/windows/main.c
@@ -43,6 +43,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tchar.h>
+#include <stdlib.h>
// MAMEOS headers
#include "strconv.h"
diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c
index 5bc4c6f8ed1..77bfbbf2483 100644
--- a/src/osd/windows/winfile.c
+++ b/src/osd/windows/winfile.c
@@ -44,6 +44,7 @@
#include <windows.h>
#include <winioctl.h>
#include <tchar.h>
+#include <stdlib.h>
// MAME headers
#include "osdcore.h"
diff --git a/src/osd/windows/winsync.c b/src/osd/windows/winsync.c
index f11a0b0fd53..829b5f42edc 100644
--- a/src/osd/windows/winsync.c
+++ b/src/osd/windows/winsync.c
@@ -42,6 +42,7 @@
// standard windows headers
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#include <stdlib.h>
// MAME headers
#include "osdcore.h"
diff --git a/src/osd/windows/winutf8.c b/src/osd/windows/winutf8.c
index fb0142c3a2e..abbcaf13151 100644
--- a/src/osd/windows/winutf8.c
+++ b/src/osd/windows/winutf8.c
@@ -43,6 +43,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shellapi.h>
+#include <stdlib.h>
// MAMEOS headers
#include "winutf8.h"
diff --git a/src/osd/windows/winwork.c b/src/osd/windows/winwork.c
index 71380144007..8c25eff0b58 100644
--- a/src/osd/windows/winwork.c
+++ b/src/osd/windows/winwork.c
@@ -44,6 +44,7 @@
#include <windows.h>
#include <process.h>
#include <tchar.h>
+#include <stdlib.h>
#ifdef __GNUC__
#include <stdint.h>