X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/wrapwin.h?ds=sidebyside diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h index 60aa48e553..afaaf084a7 100644 --- a/include/wx/msw/wrapwin.h +++ b/include/wx/msw/wrapwin.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/wrapwin.h +// Name: wx/msw/wrapwin.h // Purpose: Wrapper around , to be included instead of it // Author: Vaclav Slavik // Created: 2003/07/22 @@ -72,14 +72,15 @@ // #undef the macros defined in winsows.h which conflict with code elsewhere #include "wx/msw/winundef.h" -// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability +// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatibility // in the WINAPI SDK (they are an integral type that is the size of a -// pointer) on MSVC 7 and later. However, they are not available in older -// Platform SDKs, and since they are typedefs and not #defines we simply +// pointer) on MSVC 7 and later. However, they are not available in older +// Platform SDKs, and since they are typedefs and not #defines we simply // overwrite them if there is a chance that they're not defined -#if !defined(_MSC_VER) || (_MSC_VER < 1300) +#if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__) #define UINT_PTR unsigned int #define INT_PTR int + #define HANDLE_PTR unsigned long #define LONG_PTR long #define ULONG_PTR unsigned long #define DWORD_PTR unsigned long