Commit ef372ed2 authored by not-a-robot's avatar not-a-robot Committed by GitHub
Browse files

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 🙇
parents e30db1a3 bc0ea5c4
...@@ -13,8 +13,10 @@ ...@@ -13,8 +13,10 @@
#if defined(__sun__) #if defined(__sun__)
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#else #else
#if !(defined(__APPLE__) && defined(__MACH__))
#define _XOPEN_SOURCE 600 #define _XOPEN_SOURCE 600
#endif #endif
#endif
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
#define _OSX #define _OSX
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment