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

diff --git a/include/log.h b/include/log.h
index 0854628daf581a8958ab854a61e6f0b26a1faa31..26e85f042ee2ebab2d00160dcc6d9cc825517b20 100644 (file)
--- 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__)