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/posix/OSMem.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/posix/OSMem.c')
| -rw-r--r-- | rts/posix/OSMem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c index 48b154fa11..dcf734f19d 100644 --- a/rts/posix/OSMem.c +++ b/rts/posix/OSMem.c @@ -39,7 +39,7 @@ #include <errno.h> -#if defined(darwin_HOST_OS) || defined(ios_HOST_OS) +#if darwin_HOST_OS || ios_HOST_OS #include <mach/mach.h> #include <mach/vm_map.h> #include <sys/sysctl.h> @@ -114,7 +114,7 @@ my_mmap (void *addr, W_ size, int operation) { void *ret; -#ifdef darwin_HOST_OS +#if darwin_HOST_OS // Without MAP_FIXED, Apple's mmap ignores addr. // With MAP_FIXED, it overwrites already mapped regions, whic // mmap(0, ... MAP_FIXED ...) is worst of all: It unmaps the program text @@ -170,9 +170,9 @@ my_mmap (void *addr, W_ size, int operation) else flags = 0; -#ifdef hpux_HOST_OS +#if hpux_HOST_OS ret = mmap(addr, size, prot, flags | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); -#elif defined(linux_HOST_OS) +#elif linux_HOST_OS ret = mmap(addr, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0); if (ret == (void *)-1 && errno == EPERM) { // Linux may return EPERM if it tried to give us |