made gs_msgXXX variables static

[wxWidgets.git] / utils / HelpGen / src / scriptbinder.cpp

diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp
index eb769b7461724d9f863620ffbb26b7094bfc410f..affd6634e4cffb6988c0e0ec62e51b44a385119a 100644 (file)
--- a/utils/HelpGen/src/scriptbinder.cpp
+++ b/utils/HelpGen/src/scriptbinder.cpp
@@ -20,9 +20,6 @@
 #include "wx/wx.h"
 #endif
 
-#ifndef __DARWIN__
-#  include <malloc.h>
-#endif
 #include <string.h>
 #include <memory.h>
 
@@ -33,7 +30,7 @@
 
 // helper functions
 
-static size_t log2(size_t nr)
+static size_t wx_log2(size_t nr)
 {
     size_t tmp = 0;
     while (nr >= 2 )
@@ -66,7 +63,7 @@ void ScriptStream::WriteBytes( const void* srcBuf, size_t count )
     if ( m_Size + count > m_Capacity )
     {
         m_Capacity =
-            (  0x2 << (log2( m_Size + count ) + 1 ) );
+            (  0x2 << (wx_log2( m_Size + count ) + 1 ) );
 
         if ( m_Capacity < 128 ) m_Capacity = 128;