diff options
| author | not-a-robot <not-a-robot@rediger.net> | 2016-06-20 11:37:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-20 11:37:10 +0200 |
| commit | ef372ed2f09ed1996e27a21d3a33ca7ff922ba0f (patch) | |
| tree | 596eaf918a755c697efeed4fcd6bb791b520c01d | |
| parent | e30db1a3bea4ad464470dc22be9280c0ef58f4c1 (diff) | |
| parent | bc0ea5c466e7ce69df96ea410b2a84f7312cf1a0 (diff) | |
Auto merge of #439 - tnm:fmacros-fix, r=badboy
Do not define _XOPEN_SOURCE for OS X
redis@bb1747b appears to have introduced a build regression for OS X (and possibly elsewhere, I've only tested on a local Mac environment) — in master right now `make` reliably fails on OS X as reported in redis#431.
There looks to be another PR to fix the issue in redis#433.
This PR here simply returns to the previous behavior on OS X in a minimally-invasive way. There are of course a few different ways to do this with the directives; feel free to do something different, I just care that master can build on OS X 🙇
| -rw-r--r-- | fmacros.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -13,8 +13,10 @@ #if defined(__sun__) #define _POSIX_C_SOURCE 200112L #else +#if !(defined(__APPLE__) && defined(__MACH__)) #define _XOPEN_SOURCE 600 #endif +#endif #if defined(__APPLE__) && defined(__MACH__) #define _OSX |