summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-03-12 07:43:03 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-03-12 07:43:03 +0000
commiteb539cce9d58a349e0dffff237dc96bb926ca06f (patch)
treee86162a925dfb228169afd2fb6309cba906400c5 /src/osd
parentfeb4e2c8b368f5ec7f251e764167fd24708700f3 (diff)
Many casts added to the core files, and various other tweaks
to make them compile as either C or C++.
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/osdcomm.h2
-rw-r--r--src/osd/windows/main.c2
-rw-r--r--src/osd/windows/windows.mak2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index 5a06603081b..f446a4d6ffc 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -54,7 +54,7 @@
#define RESTRICT __restrict__
#define SETJMP_GNUC_PROTECT() (void)__builtin_return_address(1)
#ifndef TYPES_COMPATIBLE
-#define TYPES_COMPATIBLE(a,b) __builtin_types_compatible_p(a, b)
+#define TYPES_COMPATIBLE(a,b) __builtin_types_compatible_p(typeof(a), b)
#endif
#else
#define ATTR_UNUSED
diff --git a/src/osd/windows/main.c b/src/osd/windows/main.c
index ff054f21ef4..2350d31b615 100644
--- a/src/osd/windows/main.c
+++ b/src/osd/windows/main.c
@@ -15,7 +15,7 @@
// MAMEOS headers
#include "strconv.h"
-extern int utf8_main(int argc, char **argv);
+extern int utf8_main(int argc, char *argv[]);
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 6270d54db5e..22010f19be1 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -132,7 +132,7 @@ CCOMFLAGS += /wd4267
endif
# disable function pointer warnings in C++ which are evil to work around
-CPPONLYFLAGS += /wd4191
+CPPONLYFLAGS += /wd4191 /wd4060 /wd4065
# explicitly set the entry point for UNICODE builds
ifdef UNICODE