Merge branch 'master' into next

[i3/i3] / include / ipc.h

diff --git a/include/ipc.h b/include/ipc.h
index 7f92ee6142f160e5169259b5037e46c0bb6c6c74..ef50ba8630da305dd977d7d2a7482d313bdae7da 100644 (file)
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -1,16 +1,14 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * ipc.c: UNIX domain socket IPC (initialization, client handling, protocol).
  *
  */
-
-#ifndef _IPC_H
-#define _IPC_H
+#ifndef I3_IPC_H
+#define I3_IPC_H
 
 #include <ev.h>
 #include <stdbool.h>
@@ -22,6 +20,8 @@
 
 #include "i3/ipc.h"
 
+extern char *current_socketpath;
+
 typedef struct ipc_client {
         int fd;
 
@@ -78,7 +78,7 @@ void ipc_send_event(const char *event, uint32_t message_type, const char *payloa
  * when exiting or restarting only!
  *
  */
-void ipc_shutdown();
+void ipc_shutdown(void);
 
 void dump_node(yajl_gen gen, Con *con, bool inplace_restart);