Merge branch 'master' into ospath

This commit is contained in:
Joey Hess 2025-01-30 15:06:05 -04:00
commit 96c953a4b7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
13 changed files with 117 additions and 14 deletions

View file

@ -70,13 +70,11 @@ openLock sharemode f = do
Right h -> Just h
#else
h <- withTString (fromRawFilePath f') $ \c_f ->
c_CreateFile c_f gENERIC_READ sharemode security_attributes
c_CreateFile c_f gENERIC_READ sharemode (maybePtr Nothing)
oPEN_ALWAYS fILE_ATTRIBUTE_NORMAL (maybePtr Nothing)
return $ if h == iNVALID_HANDLE_VALUE
then Nothing
else Just h
where
security_attributes = maybePtr Nothing
#endif
dropLock :: LockHandle -> IO ()