Rename log2 to avoid conflict standard log2 which is a macro on Cygwin.

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

diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp
index eb769b7461724d9f863620ffbb26b7094bfc410f..e5a60fa3df25dc61eeecf2ff16d17f8262f0fd87 100644 (file)
--- a/utils/HelpGen/src/scriptbinder.cpp
+++ b/utils/HelpGen/src/scriptbinder.cpp
@@ -33,7 +33,7 @@
 
 // helper functions
 
 
 // helper functions
 

-static size_t log2(size_t nr)
+static size_t wx_log2(size_t nr)

 {
     size_t tmp = 0;
     while (nr >= 2 )
 {
     size_t tmp = 0;
     while (nr >= 2 )


@@ -66,7 +66,7 @@ void ScriptStream::WriteBytes( const void* srcBuf, size_t count )
     if ( m_Size + count > m_Capacity )
     {
         m_Capacity =
     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;
 
 
         if ( m_Capacity < 128 ) m_Capacity = 128;