Use lib64 for 64-bit builds on some kinds of linux and lib/64 on solaris

[wxWidgets.git] / src / common / ipcbase.cpp

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 902e7b8a3081a9e8bf8b615ae6935dc9c93d630f..1d5075cb25f6fcbacd0960e5c144a7f833ae1b19 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -30,10 +30,10 @@ IMPLEMENT_CLASS(wxServerBase, wxObject)
 IMPLEMENT_CLASS(wxClientBase, wxObject)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 
-wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)
+wxConnectionBase::wxConnectionBase(wxChar *buffer, int bytes)
     : m_connected(true),
       m_buffer(buffer),
-      m_buffersize(size),
+      m_buffersize(bytes),
       m_deletebufferwhendone(false)
 {
   if ( buffer == (wxChar *)NULL )
@@ -52,7 +52,8 @@ wxConnectionBase::wxConnectionBase()
 }
 
 wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
-    : m_connected(copy.m_connected),
+    : wxObject(),
+      m_connected(copy.m_connected),
       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),
       m_deletebufferwhendone(false)
@@ -79,7 +80,10 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
     { // we're in charge of buffer, increase it
       if ( m_buffer )
         delete m_buffer;
-      m_buffer = new wxChar[bytes];
+      // the argument specifies **byte size**, but m_buffer is of type
+      // wxChar. Under unicode: sizeof(wxChar) > 1, so the buffer size is
+      // bytes / sizeof(wxChar) rounded upwards.
+      m_buffer = new wxChar[(bytes + sizeof(wxChar) - 1) / sizeof(wxChar)];
       m_buffersize = bytes;
       return m_buffer;
     } // user-supplied buffer, fail