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 6a4ff39c4faa1f5e3c1b68ad6524979de5fa5fe0..c75888b96007282a24a54b063cf75503cb8f2c1d 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -2024,7 +2024,7 @@ public:
         if (buf == NULL)
         {
             //apple specs say at least 32
         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 ) ;
             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
         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 ) ;
         }
 
             tbuf = (char*) malloc( n ) ;
         }