diff options
author | couriersud <couriersud@arcor.de> | 2015-01-25 22:58:54 +0100 |
---|---|---|
committer | couriersud <couriersud@arcor.de> | 2015-01-25 22:58:54 +0100 |
commit | c3aa0eedbf0c817895d127d4cef20e1909298e9d (patch) | |
tree | 7aa5d973e9c74391a8328d98e5270f6e1d87d530 | |
parent | dd7b5a953e627ab23c28a9848b381a95b256332a (diff) |
Minor Solaris fixes. (nw)
-rw-r--r-- | src/emu/cpu/m68000/m68kcpu.h | 5 | ||||
-rw-r--r-- | src/emu/luaengine.c | 4 | ||||
-rw-r--r-- | src/emu/netlist/plists.h | 4 | ||||
-rw-r--r-- | src/osd/sdl/sdlprefix.h | 1 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index dabd5a7a301..083ef49c612 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -32,6 +32,11 @@ class m68000_base_device; #include <limits.h> +#ifdef SDLMAME_SOLARIS +#undef REG_SP +#undef REG_PC +#undef REG_FP +#endif /* ======================================================================== */ /* ==================== ARCHITECTURE-DEPENDANT DEFINES ==================== */ diff --git a/src/emu/luaengine.c b/src/emu/luaengine.c index 5431e28c341..3ec13f94e6e 100644 --- a/src/emu/luaengine.c +++ b/src/emu/luaengine.c @@ -130,6 +130,10 @@ lua_engine::hook::hook() cb = -1; } +#ifdef SDLMAME_SOLARIS +#undef _L +#endif + void lua_engine::hook::set(lua_State *_L, int idx) { if (L) diff --git a/src/emu/netlist/plists.h b/src/emu/netlist/plists.h index 9493317b709..c2f758d0d70 100644 --- a/src/emu/netlist/plists.h +++ b/src/emu/netlist/plists.h @@ -199,6 +199,10 @@ private: // pnamedlist_t: a simple list // ---------------------------------------------------------------------------------------- +#ifdef SDLMAME_SOLARIS +#undef _C +#endif + template <class _C> class pnamedlist_t : public plinearlist_t<_C> { diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h index 9b75948dc9d..9aff11e17f0 100644 --- a/src/osd/sdl/sdlprefix.h +++ b/src/osd/sdl/sdlprefix.h @@ -33,7 +33,6 @@ //#undef _XPG6 //#undef _XPG5 //#undef _XPG4_2 - //#define _XOPEN_SOURCE //#define _XOPEN_VERSION 4 #elif defined(__irix__) || defined(__sgi) |