Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-26 06:14:12 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Start removing the use of OSD macros outside OSD since core objects are shared between OSD builds

Browse Source
This commit is contained in:
Vas Crabb 2015-04-01 13:44:07 +11:00
parent 02c9e215f9
commit 8a4145b48c
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/m68000/m68kcpu.h
View File

@ -32,7 +32,7 @@ class m68000_base_device;
#include <limits.h> #include <limits.h>
#ifdef SDLMAME_SOLARIS #ifdef defined(__sun__) && defined(__svr4__)
#undef REG_SP #undef REG_SP
#undef REG_PC #undef REG_PC
#undef REG_FP #undef REG_FP

4
src/emu/emucore.h
View File

@ -23,7 +23,7 @@
#include <stdarg.h> #include <stdarg.h>
// some cleanups for Solaris for things defined in stdlib.h // some cleanups for Solaris for things defined in stdlib.h
#ifdef SDLMAME_SOLARIS #ifdef defined(__sun__) && defined(__svr4__)
#undef si_status #undef si_status
#undef WWORD #undef WWORD
#endif #endif
@ -373,7 +373,7 @@ ATTR_NORETURN void fatalerror_exitcode(running_machine &machine, int exitcode, c
//************************************************************************** //**************************************************************************
// population count // population count
#ifndef SDLMAME_NETBSD #ifndef defined(__NetBSD__)
inline int popcount(UINT32 val) inline int popcount(UINT32 val)
{ {
int count; int count;

2
src/emu/luaengine.c
View File

@ -130,7 +130,7 @@ lua_engine::hook::hook()
cb = -1; cb = -1;
} }
#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__) #if (defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__)
#undef _L #undef _L
#endif #endif

6
src/emu/machine.c
View File

@ -385,7 +385,7 @@ int running_machine::run(bool firstrun)
{ {
g_profiler.start(PROFILER_EXTRA); g_profiler.start(PROFILER_EXTRA);
#ifdef SDLMAME_EMSCRIPTEN #if defined(EMSCRIPTEN)
//break out to our async javascript loop and halt //break out to our async javascript loop and halt
js_set_main_loop(this); js_set_main_loop(this);
#endif #endif
@ -1344,7 +1344,7 @@ void system_time::full_time::set(struct tm &t)
// JAVASCRIPT PORT-SPECIFIC // JAVASCRIPT PORT-SPECIFIC
//************************************************************************** //**************************************************************************
#ifdef SDLMAME_EMSCRIPTEN #if defined(EMSCRIPTEN)
static running_machine * jsmess_machine; static running_machine * jsmess_machine;
@ -1377,4 +1377,4 @@ sound_manager * js_get_sound() {
return &(jsmess_machine->sound()); return &(jsmess_machine->sound());
} }
#endif /* SDLMAME_EMSCRIPTEN */ #endif /* defined(EMSCRIPTEN) */

2
src/emu/netlist/plists.h
View File

@ -199,7 +199,7 @@ private:
// pnamedlist_t: a simple list // pnamedlist_t: a simple list
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__) #if defined(defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__)
#undef _C #undef _C
#endif #endif

2
src/emu/ui/ui.c
View File

@ -319,7 +319,7 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0) if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE; show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE;
#ifdef SDLMAME_EMSCRIPTEN #if defined(EMSCRIPTEN)
// also disable for the JavaScript port since the startup screens do not run asynchronously // also disable for the JavaScript port since the startup screens do not run asynchronously
show_gameinfo = show_warnings = show_disclaimer = FALSE; show_gameinfo = show_warnings = show_disclaimer = FALSE;
#endif #endif