diff options
| author | sapier <Sapier at GMX dot net> | 2014-04-20 02:47:02 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-04-20 02:47:02 +0200 |
| commit | fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7 (patch) | |
| tree | cd0e8262cd2f002da270c9854cdf5fb227388712 | |
| parent | a0dd2d89f3a71a9650290a8607d773cc439c7d75 (diff) | |
| download | minetest-fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7.tar.gz minetest-fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7.tar.bz2 minetest-fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7.zip | |
Fix macro ARRAYSIZE name collision on windows
| -rw-r--r-- | src/clientiface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/clientiface.h b/src/clientiface.h index 752e2bb8a..89e0f41b9 100644 --- a/src/clientiface.h +++ b/src/clientiface.h @@ -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]; } |