From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 2 Nov 2004 09:36:13 +0000 (+0000)
Subject: wxMax instead of max, former is always around
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c543817b3280c560d53307c0fa98e7a99aa00bf9?ds=inline

wxMax instead of max, former is always around


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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 6a4ff39c4f..c75888b960 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -2024,7 +2024,7 @@ public:
         if (buf == NULL)
         {
             //apple specs say at least 32
-            n = max( 32 , byteInLen ) ;
+            n = wxMax( 32 , byteInLen ) ;
             tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ;
         }
         ByteCount byteBufferLen = n * sizeof( UniChar ) ;
@@ -2065,7 +2065,7 @@ public:
         if (buf == NULL)
         {
             //apple specs say at least 32
-            n = max( 32 , ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T );
+            n = wxMax( 32 , ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T );
             tbuf = (char*) malloc( n ) ;
         }