Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxFSVolume compilation with Cygwin in 64 bits

Browse Source 
Use __LONG32, which is always 32 bits when using Cygwin, unlike long,
which is 64 bits there in 64 bit builds, and so can't be used as an
argument to InterlockedExchange().

Closes #16746.
This commit is contained in:
Vadim Zeitlin
2018-01-12 02:38:00 +01:00
parent 6bd8cb964b
commit a5ae0685a0
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/volume.cpp
View File

@@ -68,7 +68,18 @@ static WNetCloseEnumPtr s_pWNetCloseEnum;
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Globals/Statics
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
static long s_cancelSearch = FALSE;
#if defined(__CYGWIN__) && defined(__LP64__)
// We can't use long in 64 bit Cygwin build because Cygwin uses LP64 model
// (unlike all the other MSW compilers) and long is 64 bits, while
// InterlockedExchange(), with which this variable is used, requires a 32
// bit-sized value, so use Cygwin-specific type with the right size.
typedef __LONG32 wxInterlockedArg_t;
#else
typedef long wxInterlockedArg_t;
#endif
static wxInterlockedArg_t s_cancelSearch = FALSE;
struct FileInfo
{