diff options
| author | Andreas Voellmy <andreas.voellmy@gmail.com> | 2014-09-16 07:56:54 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-09-16 07:58:36 -0500 |
| commit | 7e658bc14e2dd6baf208deebbdab9e1285ce4c72 (patch) | |
| tree | 526c6557dd697360c4bc58ff99ecdf6b60c046ed /rts/Capability.h | |
| parent | caf449e39f5e7545eeabd567349661450aa8c6e5 (diff) | |
| download | haskell-7e658bc14e2dd6baf208deebbdab9e1285ce4c72.tar.gz | |
Revert "Revert "rts/base: Fix #9423"" and resolve issue that caused the revert.
Summary:
This reverts commit 4748f5936fe72d96edfa17b153dbfd84f2c4c053. The fix for #9423
was reverted because this commit introduced a C function setIOManagerControlFd()
(defined in Schedule.c) defined for all OS types, while the prototype
(in includes/rts/IOManager.h) was only included when mingw32_HOST_OS is
not defined. This broke Windows builds.
This commit reverts the original commit and resolves the problem by only defining
setIOManagerControlFd() when mingw32_HOST_OS is defined. Hence the missing prototype
error should not occur on Windows.
In addition, since the io_manager_control_wr_fd field of the Capability struct is only
usd by the setIOManagerControlFd, this commit includes the io_manager_control_wr_fd
field in the Capability struct only when mingw32_HOST_OS is not defined.
Test Plan: Try to compile successfully on all platforms.
Reviewers: austin
Reviewed By: austin
Subscribers: simonmar, ezyang, carter
Differential Revision: https://phabricator.haskell.org/D174
Diffstat (limited to 'rts/Capability.h')
| -rw-r--r-- | rts/Capability.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rts/Capability.h b/rts/Capability.h index c7dceefe9f..9a6651e0e6 100644 --- a/rts/Capability.h +++ b/rts/Capability.h @@ -126,6 +126,10 @@ struct Capability_ { // Stats on spark creation/conversion SparkCounters spark_stats; +#if !defined(mingw32_HOST_OS) + // IO manager for this cap + int io_manager_control_wr_fd; +#endif #endif // Total words allocated by this cap since rts start W_ total_allocated; |