From: Quentin Glidic <sardemff7+git@sardemff7.net>
Date: Fri, 10 Aug 2012 13:39:50 +0000 (+0200)
Subject: i3/log.h: Prepare for libi3.h inclusion
X-Git-Tag: 4.3~91
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bc5f33878a256b3268411d110718bb2ff1b66862;p=i3%2Fi3

i3/log.h: Prepare for libi3.h inclusion
---

diff --git a/include/log.h b/include/log.h
index 0854628d..26e85f04 100644
--- a/include/log.h
+++ b/include/log.h
@@ -16,6 +16,11 @@
 /** ##__VA_ARGS__ means: leave out __VA_ARGS__ completely if it is empty, that
    is, delete the preceding comma */
 #define LOG(fmt, ...) verboselog(fmt, ##__VA_ARGS__)
+/* We will include libi3.h which define its own version of ELOG.
+ * We want *our* version, so we undef the libi3 one. */
+#if defined(ELOG)
+#undef ELOG
+#endif
 #define ELOG(fmt, ...) errorlog("ERROR: " fmt, ##__VA_ARGS__)
 #define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)