From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 29 Oct 2005 17:46:12 +0000 (+0000)
Subject: renamed BLOCK_SIZE which conflicts with a #define in a std Linux (and maybe not only... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ae0ca7559c6ad9b2c891306f1bc4cfa5ae724d6f

renamed BLOCK_SIZE which conflicts with a #define in a std Linux (and maybe not only) header (bug 1339731)


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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index c220566ffd..c15ca72c27 100644
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -124,13 +124,13 @@ class wxMemoryBufferData
 {
 public:
     // the initial size and also the size added by ResizeIfNeeded()
-    enum { BLOCK_SIZE = 1024 };
+    enum { DefBufSize = 1024 };
 
     friend class wxMemoryBuffer;
 
     // everyting is private as it can only be used by wxMemoryBuffer
 private:
-    wxMemoryBufferData(size_t size = wxMemoryBufferData::BLOCK_SIZE)
+    wxMemoryBufferData(size_t size = wxMemoryBufferData::DefBufSize)
         : m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0)
     {
     }
@@ -142,13 +142,13 @@ private:
         if (newSize > m_size)
         {
             void *dataOld = m_data;
-            m_data = realloc(m_data, newSize + wxMemoryBufferData::BLOCK_SIZE);
+            m_data = realloc(m_data, newSize + wxMemoryBufferData::DefBufSize);
             if ( !m_data )
             {
                 free(dataOld);
             }
 
-            m_size = newSize + wxMemoryBufferData::BLOCK_SIZE;
+            m_size = newSize + wxMemoryBufferData::DefBufSize;
         }
     }
 
@@ -181,7 +181,7 @@ class wxMemoryBuffer
 {
 public:
     // ctor and dtor
-    wxMemoryBuffer(size_t size = wxMemoryBufferData::BLOCK_SIZE)
+    wxMemoryBuffer(size_t size = wxMemoryBufferData::DefBufSize)
     {
         m_bufdata = new wxMemoryBufferData(size);
         m_bufdata->IncRef();