From 5aca3ef449eb605cc6b25fdc9e1ff92765e65645 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Mon, 17 Jul 2006 13:06:37 +0000 Subject: [PATCH] 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 --- utils/HelpGen/src/scriptbinder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp index eb769b7461..e5a60fa3df 100644 --- a/utils/HelpGen/src/scriptbinder.cpp +++ b/utils/HelpGen/src/scriptbinder.cpp @@ -33,7 +33,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 +66,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; -- 2.45.2