diff options
| author | 2016-02-25 13:34:56 +0100 | |
|---|---|---|
| committer | 2016-02-25 14:58:39 +0100 | |
| commit | 0f85f112c91334cbea3f87040edc3919384066be (patch) | |
| tree | 34b8e52c55409fb5b01b98c238479c00a05d5e7d /src/emu/luaengine.cpp | |
| parent | 4173530610d02ea85e3797bb83d2f8d3ac36111f (diff) | |
renamed names that clash system defines in various environments (nw)
Diffstat (limited to 'src/emu/luaengine.cpp')
| -rw-r--r-- | src/emu/luaengine.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index b8f1d0772ec..32eccb8a85b 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -136,23 +136,19 @@ lua_engine::hook::hook() cb = -1; } -#if (defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__) || defined(__OpenBSD__) -#undef _L -#endif - -void lua_engine::hook::set(lua_State *_L, int idx) +void lua_engine::hook::set(lua_State *lua, int idx) { if (L) luaL_unref(L, LUA_REGISTRYINDEX, cb); - if (lua_isnil(_L, idx)) { + if (lua_isnil(lua, idx)) { L = nullptr; cb = -1; } else { - L = _L; - lua_pushvalue(_L, idx); - cb = luaL_ref(_L, LUA_REGISTRYINDEX); + L = lua; + lua_pushvalue(lua, idx); + cb = luaL_ref(lua, LUA_REGISTRYINDEX); } } @@ -197,9 +193,9 @@ void lua_engine::resume(lua_State *L, int nparam, lua_State *root) } } -void lua_engine::resume(void *_L, INT32 param) +void lua_engine::resume(void *lua, INT32 param) { - resume(static_cast<lua_State *>(_L)); + resume(static_cast<lua_State *>(lua)); } int lua_engine::l_ioport_write(lua_State *L) |
