Fix macro ARRAYSIZE name collision on windows

minetest · Apr 20, 2014 · fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7 · fec1fa5
1 parent a0dd2d8
commit fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 src/clientiface.h
diff --git 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 @@ class ClientInterface {
 	{ 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];
 	}