Fix macro ARRAYSIZE name collision on windows
authorsapier <Sapier at GMX dot net>
Sun, 20 Apr 2014 00:47:02 +0000 (02:47 +0200)
committersapier <Sapier at GMX dot net>
Sun, 20 Apr 2014 00:47:02 +0000 (02:47 +0200)
src/clientiface.h

index 752e2bb8a466329f18f9e2ec55793c4674c13767..89e0f41b90dd407199989c11a4d12fe4aa579b2e 100644 (file)
@@ -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];
        }