From 3b1fb6297674812d511722c2fcd293e0105502b1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 16 Nov 2013 23:40:56 +0000 Subject: [PATCH] Define SIZEOF_LONG_LONG for Windows. This is important not only for consistency with the other platforms but also because without SIZEOF_LONG_LONG being defined, "%lu" format specifier can't be used with size_t values under Win64, as Arg_Size_t is not defined correctly there if SIZEOF_LONG_LONG is unknown. Closes #15670. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + include/wx/defs.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 4cdf1bf0eb..a986c14b9c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -589,6 +589,7 @@ wxGTK: wxMSW: - Fix blank wxBitmapComboBox dropdown appearance. +- Make "%lu" work with size_t arguments under Win64 (laro). 3.0.0: (released 2013-11-11) diff --git a/include/wx/defs.h b/include/wx/defs.h index 203e0f77eb..0d03f0a313 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -953,6 +953,10 @@ typedef wxUint16 wxWord; #define SIZEOF_LONG 4 #endif + #ifndef SIZEOF_LONG_LONG + #define SIZEOF_LONG_LONG 8 + #endif + #ifndef SIZEOF_WCHAR_T /* Windows uses UTF-16 */ #define SIZEOF_WCHAR_T 2