diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-05-08 18:31:47 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-05-08 18:31:47 +0100 |
| commit | 4b089dbacd2a14f38a335103cf8ac0779d92f937 (patch) | |
| tree | f8abd01f5f2a56dfa07cd76931fa45fa5d2a36ff /rts/Linker.c | |
| parent | 041d1bcf4957ec6db1365c61144e50039fbab3fe (diff) | |
| parent | 9fb12e142b80ce399285b41e8fad4f862bb6a776 (diff) | |
| download | haskell-4b089dbacd2a14f38a335103cf8ac0779d92f937.tar.gz | |
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'rts/Linker.c')
| -rw-r--r-- | rts/Linker.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index df5ab5c44a..15e61badc6 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -304,8 +304,6 @@ typedef struct _RtsSymbolVal { SymI_HasProto(__hscore_get_saved_termios) \ SymI_HasProto(__hscore_set_saved_termios) \ SymI_HasProto(shutdownHaskellAndSignal) \ - SymI_HasProto(lockFile) \ - SymI_HasProto(unlockFile) \ SymI_HasProto(signal_handlers) \ SymI_HasProto(stg_sig_install) \ SymI_HasProto(rtsTimerSignal) \ @@ -1283,6 +1281,9 @@ typedef struct _RtsSymbolVal { SymI_HasProto(n_capabilities) \ SymI_HasProto(stg_traceCcszh) \ SymI_HasProto(stg_traceEventzh) \ + SymI_HasProto(getMonotonicNSec) \ + SymI_HasProto(lockFile) \ + SymI_HasProto(unlockFile) \ RTS_USER_SIGNALS_SYMBOLS \ RTS_INTCHAR_SYMBOLS |