diff options
| author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-06-05 14:46:28 +0200 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2020-06-17 11:03:17 +0100 |
| commit | 3840771c98c7b8e32856dd16b410d9ca6299c1f1 (patch) | |
| tree | 11786e73429cbdc22ed19dbdca79259914f0e6f4 | |
| parent | fd9045d8d02ec2874edd5943145afbe56f48de7b (diff) | |
| download | haskell-3840771c98c7b8e32856dd16b410d9ca6299c1f1.tar.gz | |
winio: Fix builderrors from merge artefacts.
Namely getIoManagerFlag and use of unsafeCopyFromBuffer.
| -rw-r--r-- | libraries/base/GHC/Event/Windows.hsc | 2 | ||||
| -rw-r--r-- | libraries/base/GHC/RTS/Flags.hsc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libraries/base/GHC/Event/Windows.hsc b/libraries/base/GHC/Event/Windows.hsc index ab9982c2b3..823d237900 100644 --- a/libraries/base/GHC/Event/Windows.hsc +++ b/libraries/base/GHC/Event/Windows.hsc @@ -1077,7 +1077,7 @@ processRemoteCompletion = do _ <- peekArray n entries mngr <- getSystemManager let arr = mgrOverlappedEntries mngr - A.unsafeSet arr entries n + A.unsafeCopyFromBuffer arr entries n -- Process timeouts delay <- runExpiredTimeouts mngr :: IO (Maybe Seconds) diff --git a/libraries/base/GHC/RTS/Flags.hsc b/libraries/base/GHC/RTS/Flags.hsc index e556417fc9..03cd368723 100644 --- a/libraries/base/GHC/RTS/Flags.hsc +++ b/libraries/base/GHC/RTS/Flags.hsc @@ -533,7 +533,7 @@ getIoManagerFlag :: IO IoSubSystem getIoManagerFlag = do let ptr = (#ptr RTS_FLAGS, MiscFlags) rtsFlagsPtr mgrFlag <- (#{peek MISC_FLAGS, ioManager} ptr :: IO Word32) - (toEnum . fromIntegral) + return $ (toEnum . fromIntegral) mgrFlag getDebugFlags :: IO DebugFlags getDebugFlags = do |