Merge branch 'master' into next

[i3/i3] / include / ipc.h

diff --git a/include/ipc.h b/include/ipc.h
index 9b59fb0163d48abd65c90eee0faaf717794c5abb..ef50ba8630da305dd977d7d2a7482d313bdae7da 100644 (file)
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -7,8 +7,8 @@
  * 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>
@@ -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);