summaryrefslogtreecommitdiff
path: root/includes/rts/OSThreads.h
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2017-04-05 12:01:12 -0400
committerBen Gamari <ben@smart-cactus.org>2017-04-05 12:12:48 -0400
commit819c3db73acf5246cd332ad3062c61b7a2e8ee68 (patch)
tree7425f16a8771d1bb917afb65b848ebf855c8c619 /includes/rts/OSThreads.h
parent4a1eed40bec08d50634b9754448ae34666e71fb2 (diff)
downloadhaskell-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 'includes/rts/OSThreads.h')
-rw-r--r--includes/rts/OSThreads.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h
index fd9b44cc55..2ebbd1e0f1 100644
--- a/includes/rts/OSThreads.h
+++ b/includes/rts/OSThreads.h
@@ -17,7 +17,7 @@
#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS)
-#ifdef CMINUSMINUS
+#if CMINUSMINUS
#define OS_ACQUIRE_LOCK(mutex) foreign "C" pthread_mutex_lock(mutex)
#define OS_RELEASE_LOCK(mutex) foreign "C" pthread_mutex_unlock(mutex)
@@ -76,7 +76,7 @@ EXTERN_INLINE int TRY_ACQUIRE_LOCK(pthread_mutex_t *mutex)
# elif defined(HAVE_WINDOWS_H)
-#ifdef CMINUSMINUS
+#if CMINUSMINUS
/* We jump through a hoop here to get a CCall EnterCriticalSection
and LeaveCriticalSection, as that's what C-- wants. */