From 8240083d9f06de0df94fedf6f254e5cff6d20939 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 May 2014 13:16:15 +0000 Subject: [PATCH] Use DWORD instead of unsigned long in wxFileSystemWatcher wxMSW code. These two types are not the same in 64 bit Cygwin builds, so fix the build by just using DWORD everywhere. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/private/fswatcher.h | 2 +- src/msw/fswatcher.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h index d0329194a4..38e3b41ee0 100644 --- a/include/wx/msw/private/fswatcher.h +++ b/include/wx/msw/private/fswatcher.h @@ -236,7 +236,7 @@ public: // This function can block forever in it's wait for completion status. // Use PostEmptyStatus() to wake it up (and end the worker thread) Status - GetStatus(unsigned long* count, wxFSWatchEntryMSW** watch, + GetStatus(DWORD* count, wxFSWatchEntryMSW** watch, OVERLAPPED** overlapped) { wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, Status_Error, diff --git a/src/msw/fswatcher.cpp b/src/msw/fswatcher.cpp index cbfc0a8860..7269112f52 100644 --- a/src/msw/fswatcher.cpp +++ b/src/msw/fswatcher.cpp @@ -221,7 +221,7 @@ wxThread::ExitCode wxIOCPThread::Entry() // true otherwise bool wxIOCPThread::ReadEvents() { - unsigned long count = 0; + DWORD count = 0; wxFSWatchEntryMSW* watch = NULL; OVERLAPPED* overlapped = NULL; switch ( m_iocp->GetStatus(&count, &watch, &overlapped) )