diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-04-05 12:01:12 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-05 12:12:48 -0400 |
| commit | 819c3db73acf5246cd332ad3062c61b7a2e8ee68 (patch) | |
| tree | 7425f16a8771d1bb917afb65b848ebf855c8c619 /rts/Schedule.c | |
| parent | 4a1eed40bec08d50634b9754448ae34666e71fb2 (diff) | |
| download | haskell-819c3db73acf5246cd332ad3062c61b7a2e8ee68.tar.gz | |
Revert "Enable new warning for fragile/incorrect CPP #if usage"
This is causing too much platform dependent breakage at the moment. We
will need a more rigorous testing strategy before this can be
merged again.
This reverts commit 7e340c2bbf4a56959bd1e95cdd1cfdb2b7e537c2.
Diffstat (limited to 'rts/Schedule.c')
| -rw-r--r-- | rts/Schedule.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c index 296461b38d..b77e7a21ef 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -411,7 +411,7 @@ run_thread: prev_what_next = t->what_next; errno = t->saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS SetLastError(t->saved_winerror); #endif @@ -490,7 +490,7 @@ run_thread: // XXX: possibly bogus for SMP because this thread might already // be running again, see code below. t->saved_errno = errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS // Similarly for Windows error code t->saved_winerror = GetLastError(); #endif @@ -2374,12 +2374,12 @@ suspendThread (StgRegTable *reg, bool interruptible) int saved_errno; StgTSO *tso; Task *task; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS StgWord32 saved_winerror; #endif saved_errno = errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS saved_winerror = GetLastError(); #endif @@ -2419,7 +2419,7 @@ suspendThread (StgRegTable *reg, bool interruptible) RELEASE_LOCK(&cap->lock); errno = saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS SetLastError(saved_winerror); #endif return task; @@ -2433,12 +2433,12 @@ resumeThread (void *task_) Capability *cap; Task *task = task_; int saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS StgWord32 saved_winerror; #endif saved_errno = errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS saved_winerror = GetLastError(); #endif @@ -2475,7 +2475,7 @@ resumeThread (void *task_) cap->r.rCurrentTSO = tso; cap->in_haskell = true; errno = saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS SetLastError(saved_winerror); #endif |