diff options
| -rw-r--r-- | includes/rts/FileLock.h | 4 | ||||
| -rw-r--r-- | rts/FileLock.c | 4 | ||||
| -rw-r--r-- | rts/package.conf.in | 2 | ||||
| -rw-r--r-- | rts/rts.cabal.in | 2 | ||||
| -rw-r--r-- | rts/win32/libHSbase.def | 1 |
5 files changed, 4 insertions, 9 deletions
diff --git a/includes/rts/FileLock.h b/includes/rts/FileLock.h index baf9f680fb..69df911595 100644 --- a/includes/rts/FileLock.h +++ b/includes/rts/FileLock.h @@ -33,5 +33,5 @@ /* No valid FD would be negative, so use a word instead of int so the value is compatible with a Windows handle. */ -int lockFile(StgWord id, StgWord64 dev, StgWord64 ino, int for_writing); -int unlockFile(StgWord id); +int lockFile(StgWord64 id, StgWord64 dev, StgWord64 ino, int for_writing); +int unlockFile(StgWord64 id); diff --git a/rts/FileLock.c b/rts/FileLock.c index 34f4046b38..4509de1a42 100644 --- a/rts/FileLock.c +++ b/rts/FileLock.c @@ -76,7 +76,7 @@ freeFileLocking(void) } int -lockFile(StgWord id, StgWord64 dev, StgWord64 ino, int for_writing) +lockFile(StgWord64 id, StgWord64 dev, StgWord64 ino, int for_writing) { Lock key, *lock; @@ -113,7 +113,7 @@ lockFile(StgWord id, StgWord64 dev, StgWord64 ino, int for_writing) } int -unlockFile(StgWord id) +unlockFile(StgWord64 id) { Lock *lock; diff --git a/rts/package.conf.in b/rts/package.conf.in index d59d0ce641..8b7390865b 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -98,7 +98,6 @@ ld-options: , "-Wl,-u,_base_GHCziIOziException_cannotCompactPinned_closure" , "-Wl,-u,_base_GHCziIOziException_cannotCompactMutable_closure" , "-Wl,-u,_base_GHCziIOPort_doubleReadException_closure" - , "-Wl,-u,_base_ControlziExceptionziBase_absentSumFieldError_closure" , "-Wl,-u,_base_ControlziExceptionziBase_nonTermination_closure" , "-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_closure" , "-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_closure" @@ -213,7 +212,6 @@ ld-options: , "-Wl,-u,base_GHCziIOziException_cannotCompactPinned_closure" , "-Wl,-u,base_GHCziIOziException_cannotCompactMutable_closure" , "-Wl,-u,base_GHCziIOPort_doubleReadException_closure" - , "-Wl,-u,base_ControlziExceptionziBase_absentSumFieldError_closure" , "-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure" , "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure" , "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure" diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index a890d3dc1d..1a1eb30611 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -228,7 +228,6 @@ library "-Wl,-u,_base_GHCziIOziException_cannotCompactPinned_closure" "-Wl,-u,_base_GHCziIOziException_cannotCompactMutable_closure" "-Wl,-u,_base_GHCziIOPort_doubleReadException_closure" - "-Wl,-u,_base_ControlziExceptionziBase_absentSumFieldError_closure" "-Wl,-u,_base_ControlziExceptionziBase_nonTermination_closure" "-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_closure" "-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_closure" @@ -310,7 +309,6 @@ library "-Wl,-u,base_GHCziIOziException_cannotCompactPinned_closure" "-Wl,-u,base_GHCziIOziException_cannotCompactMutable_closure" "-Wl,-u,base_GHCziIOPort_doubleReadException_closure" - "-Wl,-u,base_ControlziExceptionziBase_absentSumFieldError_closure" "-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure" "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure" "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure" diff --git a/rts/win32/libHSbase.def b/rts/win32/libHSbase.def index 733fffb5df..cb9c32729e 100644 --- a/rts/win32/libHSbase.def +++ b/rts/win32/libHSbase.def @@ -44,7 +44,6 @@ EXPORTS base_GHCziIOziException_cannotCompactPinned_closure base_GHCziIOziException_cannotCompactMutable_closure base_GHCziIOPort_doubleReadException_closure - base_ControlziExceptionziBase_absentSumFieldError_closure base_ControlziExceptionziBase_nonTermination_closure base_ControlziExceptionziBase_nestedAtomically_closure base_GHCziEventziThread_blockedOnBadFD_closure |