summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAndreas Voellmy <andreas.voellmy@gmail.com>2014-09-16 07:56:54 -0500
committerAustin Seipp <austin@well-typed.com>2014-09-16 07:58:36 -0500
commit7e658bc14e2dd6baf208deebbdab9e1285ce4c72 (patch)
tree526c6557dd697360c4bc58ff99ecdf6b60c046ed /includes
parentcaf449e39f5e7545eeabd567349661450aa8c6e5 (diff)
downloadhaskell-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 'includes')
-rw-r--r--includes/rts/IOManager.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/rts/IOManager.h b/includes/rts/IOManager.h
index 1c331b97af..7bf2cdf43c 100644
--- a/includes/rts/IOManager.h
+++ b/includes/rts/IOManager.h
@@ -26,7 +26,8 @@ void sendIOManagerEvent (HsWord32 event);
#else
-void setIOManagerControlFd (int fd);
+void setIOManagerControlFd (nat cap_no, int fd);
+void setTimerManagerControlFd(int fd);
void setIOManagerWakeupFd (int fd);
#endif