Fix macro ARRAYSIZE name collision on windows

sapier · sapier · commit fec1fa51e061 · 2014-04-20T02:47:02.000+02:00
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];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ namespace con {`
`141`	`141`	`class Connection;`
`142`	`142`	`}`
`143`	`143`
`144`		`-#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))`
	`144`	`+#define CI_ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))`
`145`	`145`
`146`	`146`	`enum ClientState`
`147`	`147`	`{`
`@@ -433,7 +433,7 @@ class ClientInterface {`
`433`	`433`	`{ assert(m_env == 0); m_env = env; }`
`434`	`434`
`435`	`435`	`static std::string state2Name(ClientState state) {`
`436`		`- assert((int) state < ARRAYSIZE(statenames));`
	`436`	`+ assert((int) state < CI_ARRAYSIZE(statenames));`
`437`	`437`	`return statenames[state];`
`438`	`438`	`}`
`439`	`439`