diff options
| author | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
| commit | 5f003d228340c3ce8e500f9053f353c58dc1dc94 (patch) | |
| tree | a855b0f173ff635b48354e1136ef6cbb2a1214a4 /rts/Threads.c | |
| parent | ff9c5570395bcacf8963149b3a8475f5644ce694 (diff) | |
| parent | dff0623d5ab13222c06b3ff6b32793e05b417970 (diff) | |
| download | haskell-wip/generics-propeq.tar.gz | |
Merge branch 'master' into wip/generics-propeqwip/generics-propeq
Conflicts:
compiler/typecheck/TcGenGenerics.lhs
Diffstat (limited to 'rts/Threads.c')
| -rw-r--r-- | rts/Threads.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rts/Threads.c b/rts/Threads.c index af4353fc49..b1912d83f4 100644 --- a/rts/Threads.c +++ b/rts/Threads.c @@ -221,7 +221,7 @@ removeThreadFromDeQueue (Capability *cap, } } } - barf("removeThreadFromMVarQueue: not found"); + barf("removeThreadFromDeQueue: not found"); } /* ---------------------------------------------------------------------------- @@ -880,3 +880,11 @@ printThreadQueue(StgTSO *t) } #endif /* DEBUG */ + +// Local Variables: +// mode: C +// fill-column: 80 +// indent-tabs-mode: nil +// c-basic-offset: 4 +// buffer-file-coding-system: utf-8-unix +// End: |