Merge branch 'master' into next

[i3/i3] / include / ipc.h

diff --git a/include/ipc.h b/include/ipc.h
index 63d59141cee191c5325e50d79f3bc2364b5eb1d8..a5de487aeeb177def2834824f384417a74f2b414 100644 (file)
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -13,9 +13,17 @@
 #define _IPC_H
 
 #include <ev.h>
+#include <stdbool.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_parse.h>
+
+#include "data.h"
+#include "tree.h"
 
 #include "i3/ipc.h"
 
+extern char *current_socketpath;
+
 typedef struct ipc_client {
         int fd;
 
@@ -74,4 +82,6 @@ void ipc_send_event(const char *event, uint32_t message_type, const char *payloa
  */
 void ipc_shutdown();
 
+void dump_node(yajl_gen gen, Con *con, bool inplace_restart);
+
 #endif