Skip to content
Permalink
Browse files

Fix macro ARRAYSIZE name collision on windows

  • Loading branch information...
sapier sapier
sapier authored and sapier committed Apr 20, 2014
1 parent a0dd2d8 commit fec1fa51e06185c81a4a69a0a88c1a6ccc68bce7
Showing with 2 additions and 2 deletions.
  1. +2 −2 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];
}

0 comments on commit fec1fa5

Please sign in to comment.
You can’t perform that action at this time.