Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

renamed names that clash system defines in various environments (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-02-25 13:34:56 +01:00
parent 4173530610
commit 0f85f112c9
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/emu/luaengine.cpp
View File

@ -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)

22
src/lib/netlist/nl_base.h
View File

@ -1185,38 +1185,38 @@ namespace netlist
ATTR_COLD net_t *find_net(const pstring &name);
template<class _C>
ATTR_COLD plist_t<_C *> get_device_list()
template<class _device_class>
ATTR_COLD plist_t<_device_class *> get_device_list()
{
plist_t<_C *> tmp;
plist_t<_device_class *> tmp;
for (std::size_t i = 0; i < m_devices.size(); i++)
{
_C *dev = dynamic_cast<_C *>(m_devices[i]);
_device_class *dev = dynamic_cast<_device_class *>(m_devices[i]);
if (dev != NULL)
tmp.add(dev);
}
return tmp;
}
template<class _C>
ATTR_COLD _C *get_first_device()
template<class _device_class>
ATTR_COLD _device_class *get_first_device()
{
for (std::size_t i = 0; i < m_devices.size(); i++)
{
_C *dev = dynamic_cast<_C *>(m_devices[i]);
_device_class *dev = dynamic_cast<_device_class *>(m_devices[i]);
if (dev != NULL)
return dev;
}
return NULL;
}
template<class _C>
ATTR_COLD _C *get_single_device(const char *classname)
template<class _device_class>
ATTR_COLD _device_class *get_single_device(const char *classname)
{
_C *ret = NULL;
_device_class *ret = NULL;
for (std::size_t i = 0; i < m_devices.size(); i++)
{
_C *dev = dynamic_cast<_C *>(m_devices[i]);
_device_class *dev = dynamic_cast<_device_class *>(m_devices[i]);
if (dev != NULL)
{
if (ret != NULL)

8
src/lib/netlist/nl_factory.h
View File

@ -45,7 +45,7 @@ namespace netlist
pstring m_def_param; /* default parameter */
};
template <class C>
template <class _device_class>
class factory_t : public base_factory_t
{
P_PREVENT_COPYING(factory_t)
@ -56,7 +56,7 @@ namespace netlist
ATTR_COLD device_t *Create() override
{
device_t *r = palloc(C);
device_t *r = palloc(_device_class);
//r->init(setup, name);
return r;
}
@ -68,11 +68,11 @@ namespace netlist
factory_list_t(setup_t &m_setup);
~factory_list_t();
template<class _C>
template<class _device_class>
ATTR_COLD void register_device(const pstring &name, const pstring &classname,
const pstring &def_param)
{
if (!add(name, palloc(factory_t< _C >(name, classname, def_param))))
if (!add(name, palloc(factory_t< _device_class >(name, classname, def_param))))
error("factory already contains " + name);
}