Merge branch 'master' into next

[i3/i3] / include / log.h

diff --git a/include/log.h b/include/log.h
index 26e85f042ee2ebab2d00160dcc6d9cc825517b20..c9d1d0cd67a15e4f7652fb7128b327022e7fc543 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -7,20 +7,23 @@
  * log.c: Logging functions.
  *
  */
-#ifndef _LOG_H
-#define _LOG_H
+#ifndef I3_LOG_H
+#define I3_LOG_H
 
 #include <stdarg.h>
 #include <stdbool.h>
 
-/** ##__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 will include libi3.h which define its own version of LOG, ELOG.
  * We want *our* version, so we undef the libi3 one. */
+#if defined(LOG)
+#undef LOG
+#endif
 #if defined(ELOG)
 #undef ELOG
 #endif
+/** ##__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__)
 #define ELOG(fmt, ...) errorlog("ERROR: " fmt, ##__VA_ARGS__)
 #define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)
 
@@ -35,6 +38,18 @@ extern int shmlog_size;
  */
 void init_logging(void);
 
+/**
+ * Opens the logbuffer.
+ *
+ */
+void open_logbuffer(void);
+
+/**
+ * Closes the logbuffer.
+ *
+ */
+void close_logbuffer(void);
+
 /**
  * Set debug logging.
  *