mirror of
https://github.com/moparisthebest/minetest
synced 2024-12-23 08:08:47 -05: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;
|
||||
}
|
||||
|
||||
#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
|
||||
#define CI_ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
|
||||
|
||||
enum ClientState
|
||||
{
|
||||
@ -433,7 +433,7 @@ public:
|
||||
{ assert(m_env == 0); m_env = env; }
|
||||
|
||||
static std::string state2Name(ClientState state) {
|
||||
assert((int) state < ARRAYSIZE(statenames));
|
||||
assert((int) state < CI_ARRAYSIZE(statenames));
|
||||
return statenames[state];
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user