zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #439 - tnm:fmacros-fix, r=badboy

Browse Source 
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 🙇
This commit is contained in:
not-a-robot 2016-06-20 11:37:10 +02:00 committed by GitHub
commit ef372ed2f0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fmacros.h
View File

@ -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