From fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7 Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 20 Apr 2014 02:47:02 +0200 Subject: [PATCH] Fix macro ARRAYSIZE name collision on windows --- src/clientiface.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/clientiface.h b/src/clientiface.h index 752e2bb8..89e0f41b 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]; } -- 2.30.2