diff options
| author | Ben Gamari <ben@well-typed.com> | 2017-01-23 14:52:36 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-01-24 16:42:16 -0500 |
| commit | 2aaafc8b9788e4a3447a10740479e0e7c0622cda (patch) | |
| tree | b9ce8084c8d5f842221ba1c2c1a474542fcc1941 /testsuite/timeout | |
| parent | 2cc67adb29b33e15727c6463ed84e43cc159b3a2 (diff) | |
| download | haskell-2aaafc8b9788e4a3447a10740479e0e7c0622cda.tar.gz | |
Bump Win32 version.
Bump the version of `Win32` to `2.5.0.0` which is a major update and includes
fixes for wrong alignments and wrong 64-bit types. Strangely enough this also
seems to resolve #12713, where `T10858` was failing due to too-low allocations.
The underlying type aliases have changed, so there is a potential
for user programs not to compile anymore, but the types were incorrect.
This also requires a bump in the `directory`, `Cabal`, and `process`
submodules.
Original author: Tamar Christina <tamar@zhox.com>
Test Plan: ./validate
Reviewers: bgamari, RyanGlScott, austin
Subscribers: hvr, RyanGlScott, thomie, #ghc_windows_task_force
Differential Revision: https://phabricator.haskell.org/D2938
Diffstat (limited to 'testsuite/timeout')
| -rw-r--r-- | testsuite/timeout/WinCBindings.hsc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/testsuite/timeout/WinCBindings.hsc b/testsuite/timeout/WinCBindings.hsc index 0c4ff3f5b4..a72cdcfafb 100644 --- a/testsuite/timeout/WinCBindings.hsc +++ b/testsuite/timeout/WinCBindings.hsc @@ -259,9 +259,10 @@ foreign import WINDOWS_CCONV unsafe "windows.h WaitForSingleObject" type JOBOBJECTINFOCLASS = CInt type PVOID = Ptr () - -type ULONG_PTR = CUIntPtr type PULONG_PTR = Ptr ULONG_PTR +#if !MIN_VERSION_Win32(2,5,0) +type ULONG_PTR = CUIntPtr +#endif jobObjectExtendedLimitInformation :: JOBOBJECTINFOCLASS jobObjectExtendedLimitInformation = #const JobObjectExtendedLimitInformation |