summaryrefslogtreecommitdiff
path: root/rts/RtsUtils.c
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 /rts/RtsUtils.c
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 'rts/RtsUtils.c')
-rw-r--r--rts/RtsUtils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/RtsUtils.c b/rts/RtsUtils.c
index 996d28ac4c..85f951addd 100644
--- a/rts/RtsUtils.c
+++ b/rts/RtsUtils.c
@@ -22,7 +22,7 @@
/* HACK: On Mac OS X 10.4 (at least), time.h doesn't declare ctime_r with
* _POSIX_C_SOURCE. If this is the case, we declare it ourselves.
*/
-#if defined(HAVE_CTIME_R) && !HAVE_DECL_CTIME_R
+#if HAVE_CTIME_R && !HAVE_DECL_CTIME_R
extern char *ctime_r(const time_t *, char *);
#endif
@@ -164,7 +164,7 @@ time_str(void)
if (now == 0) {
time(&now);
-#if defined(HAVE_CTIME_R)
+#if HAVE_CTIME_R
ctime_r(&now, nowstr);
#else
strcpy(nowstr, ctime(&now));