kahrl
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix macro ARRAYSIZE name collision on windows

master
sapier 2014-04-20 02:47:02 +02:00
parent a0dd2d89f3
commit fec1fa51e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clientiface.h
View File

@ -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];
} }