mirror of
https://github.com/minetest/minetest.git
synced 2024-11-27 10:03:45 +01:00
Fix macro ARRAYSIZE name collision on windows
This commit is contained in:
parent
a0dd2d89f3
commit
fec1fa51e0
@ -141,7 +141,7 @@ namespace con {
|
|||||||
class Connection;
|
class Connection;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
|
#define CI_ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
|
||||||
|
|
||||||
enum ClientState
|
enum ClientState
|
||||||
{
|
{
|
||||||
@ -433,7 +433,7 @@ public:
|
|||||||
{ assert(m_env == 0); m_env = env; }
|
{ assert(m_env == 0); m_env = env; }
|
||||||
|
|
||||||
static std::string state2Name(ClientState state) {
|
static std::string state2Name(ClientState state) {
|
||||||
assert((int) state < ARRAYSIZE(statenames));
|
assert((int) state < CI_ARRAYSIZE(statenames));
|
||||||
return statenames[state];
|
return statenames[state];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user