use wxLongLong_t instead of long long

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index c63bfcc55255ac9f774fbe34a393bfbb39be94d0..52fc61910b081158361790d7509d6452b0ad69bb 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -243,7 +243,7 @@ typedef union {
     int pad_int;                        //  %d, %i, %o, %u, %x, %X
     long int pad_longint;               // %ld, etc
 #ifdef wxLongLong_t
     int pad_int;                        //  %d, %i, %o, %u, %x, %X
     long int pad_longint;               // %ld, etc
 #ifdef wxLongLong_t

-    long long int pad_longlongint;      // %Ld, etc
+    wxLongLong_t pad_longlongint;      // %Ld, etc

 #endif
     size_t pad_sizet;                   // %Zd, etc
 
 #endif
     size_t pad_sizet;                   // %Zd, etc
 


@@ -534,9 +534,9 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
                 else if (ilen == 2)
 #ifdef wxLongLong_t
                     m_type = wxPAT_LONGLONGINT;
                 else if (ilen == 2)
 #ifdef wxLongLong_t
                     m_type = wxPAT_LONGLONGINT;

-#else // !long long
+#else // !wxLongLong_t

                     m_type = wxPAT_LONGINT;
                     m_type = wxPAT_LONGINT;

-#endif // long long/!long long
+#endif // wxLongLong_t/!wxLongLong_t

                 else if (ilen == 3)
                     m_type = wxPAT_SIZET;
                 done = true;
                 else if (ilen == 3)
                     m_type = wxPAT_SIZET;
                 done = true;


@@ -704,9 +704,9 @@ bool wxPrintfConvSpec::LoadArg(wxPrintfArg *p, va_list &argptr)
             break;
 #ifdef wxLongLong_t
         case wxPAT_LONGLONGINT:
             break;
 #ifdef wxLongLong_t
         case wxPAT_LONGLONGINT:

-            p->pad_longlongint = va_arg(argptr, long long int);
+            p->pad_longlongint = va_arg(argptr, wxLongLong_t);

             break;
             break;

-#endif
+#endif // wxLongLong_t

         case wxPAT_SIZET:
             p->pad_sizet = va_arg(argptr, size_t);
             break;
         case wxPAT_SIZET:
             p->pad_sizet = va_arg(argptr, size_t);
             break;