From b2add1e7afb59df2bb77f4a411461ece3b74dd13 Mon Sep 17 00:00:00 2001
From: Alex <dev@xrng.net>
Date: Thu, 30 Mar 2017 00:29:25 +0800
Subject: [PATCH] Undefine EV_ERROR before including ev.h

libev's ev.h has certain defines that clash with system included
headers on both MacOS and Linux. On MacOS the clashing name comes
from /usr/include/sys/event.h:167:29 and on Linux from elf.h.

This issue is reported upstream to the maintainer as well.
---
 include/redox/client.hpp  | 2 ++
 include/redox/command.hpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/include/redox/client.hpp b/include/redox/client.hpp
index 12a95bc..9465141 100644
--- a/include/redox/client.hpp
+++ b/include/redox/client.hpp
@@ -36,6 +36,8 @@
 
 #include <hiredis/hiredis.h>
 #include <hiredis/async.h>
+
+#undef EV_ERROR
 #include <hiredis/adapters/libev.h>
 
 #include "utils/logger.hpp"
diff --git a/include/redox/command.hpp b/include/redox/command.hpp
index 69b44c4..a4b292d 100644
--- a/include/redox/command.hpp
+++ b/include/redox/command.hpp
@@ -26,6 +26,7 @@
 #include <mutex>
 #include <condition_variable>
 
+#undef EV_ERROR
 #include <hiredis/adapters/libev.h>
 #include <hiredis/async.h>