avoid undefined behavior from token paste resulting in more than one token

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 4d4b4bbf695329285c3d461a7c5aba219921f832..44704739c516f40a5d20fbbb0edfe1d1202f156d 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -928,7 +928,7 @@ typedef wxUint32 wxDword;
     #define wxINT64_MIN LLONG_MIN
 #else
     #define wxINT64_MAX wxLL(9223372036854775807)
     #define wxINT64_MIN LLONG_MIN
 #else
     #define wxINT64_MAX wxLL(9223372036854775807)

-    #define wxINT64_MIN wxLL(-9223372036854775807-1)
+    #define wxINT64_MIN (wxLL(-9223372036854775807)-1)

 #endif
 
 /*
 #endif
 
 /*

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 9ae281d008da750a34f8246e6b17f3b9fbea3b05..c329848585c7c2006e12f73f976bc4015f52b1d1 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -1039,12 +1039,9 @@ static wxLongLong_t wxCRT_DoStrtoll(const T* nptr, T** endptr, int base)
 
     if ( sign == wxT('-') )
     {
 
     if ( sign == wxT('-') )
     {

-        if ( uval <= wxULL(wxINT64_MAX+1) )
+        if (uval <= (wxULongLong_t)wxINT64_MAX + 1)

         {
         {

-            if ( uval == wxULL(wxINT64_MAX+1))
-                val = -((wxLongLong_t)wxINT64_MAX) - 1;
-            else
-                val = -((wxLongLong_t)uval);
+            val = -(wxLongLong_t)uval;

         }
         else
         {
         }
         else
         {