From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 6 Jun 2009 23:16:27 +0000 (+0000)
Subject: rename ARRAYSIZE to CELLSARRAYSIZE to avoid conflict with a macro with the same name... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/23a6a62ffa898cd3902339988f3c2ec98c35e332?ds=inline

rename ARRAYSIZE to CELLSARRAYSIZE to avoid conflict with a macro with the same name defined in Windows headers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/demos/life/game.cpp b/demos/life/game.cpp
index 9f32be7153..eefae2c2de 100644
--- a/demos/life/game.cpp
+++ b/demos/life/game.cpp
@@ -31,7 +31,7 @@
 #include <string.h>           // for memset
 
 
-#define ARRAYSIZE  1024       // static array for BeginFind & co.
+#define CELLSARRAYSIZE  1024       // static array for BeginFind & co.
 #define ALLOCBOXES 16         // number of cellboxes to alloc at once
 #define MAXDEAD    8          // tics before removing cellbox from list
 
@@ -123,7 +123,7 @@ Life::Life()
         m_boxes[i] = NULL;
 
     // state vars for BeginFind & FindMore
-    m_cells       = new LifeCell[ARRAYSIZE];
+    m_cells       = new LifeCell[CELLSARRAYSIZE];
     m_ncells      = 0;
     m_findmore    = false;
     m_changed     = false;
@@ -524,7 +524,7 @@ bool Life::FindMore(LifeCell *cells[], size_t *ncells)
                     continue;
 
                 // check whether there is enough space left in the array
-                if (m_ncells > (ARRAYSIZE - 64))
+                if (m_ncells > (CELLSARRAYSIZE - 64))
                 {
                     *ncells = m_ncells;
                     return false;
@@ -549,7 +549,7 @@ bool Life::FindMore(LifeCell *cells[], size_t *ncells)
                     continue;
 
                 // check whether there is enough space left in the array
-                if (m_ncells > (ARRAYSIZE - 64))
+                if (m_ncells > (CELLSARRAYSIZE - 64))
                 {
                     *ncells = m_ncells;
                     return false;