diff options
author | Bartosz Nitka <niteria@gmail.com> | 2018-05-17 08:06:33 -0700 |
---|---|---|
committer | Bartosz Nitka <niteria@gmail.com> | 2018-05-17 08:06:34 -0700 |
commit | 5d3b15ecbf17b7747c2f7313a981c60a2d22904d (patch) | |
tree | 64709fa322560091b7339614e36833a20f364f34 /rts/RtsMessages.c | |
parent | f27e4f624fe1270e8027ff0a14f03514f5be31b7 (diff) | |
download | haskell-5d3b15ecbf17b7747c2f7313a981c60a2d22904d.tar.gz |
Fix unwinding of C -> Haskell FFI calls with -threaded (2nd try)
Summary:
See the new note.
This should fix cb5c2fe875965b7aedbc189012803fc62e48fb3f enough
to unbreak Windows and OS X builds.
Test Plan: manual testing with patched gdb
Reviewers: bgamari, simonmar, erikd
Reviewed By: bgamari
Subscribers: rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4694
Diffstat (limited to 'rts/RtsMessages.c')
-rw-r--r-- | rts/RtsMessages.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rts/RtsMessages.c b/rts/RtsMessages.c index d976760242..053805e763 100644 --- a/rts/RtsMessages.c +++ b/rts/RtsMessages.c @@ -8,6 +8,7 @@ #include "PosixSource.h" #include "Rts.h" +#include "RtsUtils.h" #include "eventlog/EventLog.h" @@ -132,9 +133,6 @@ isGUIApp(void) } #endif -#define xstr(s) str(s) -#define str(s) #s - void GNU_ATTRIBUTE(__noreturn__) rtsFatalInternalErrorFn(const char *s, va_list ap) { |