Merge branch 'master' into next

[i3/i3] / include / x.h

diff --git a/include/x.h b/include/x.h
index 36c774316605552bf35ba2a687cedecfa915a3ec..07f8a725cfb3a8e3c52eefbfd94246b28951bd6d 100644 (file)
--- a/include/x.h
+++ b/include/x.h
@@ -8,8 +8,7 @@
  *      render.c). Basically a big state machine.
  *
  */
-#ifndef _X_H
-#define _X_H
+#pragma once
 
 /** Stores the X11 window ID of the currently focused window */
 extern xcb_window_t focused_id;
@@ -104,11 +103,17 @@ void x_raise_con(Con *con);
  */
 void x_set_name(Con *con, const char *name);
 
+/**
+ * Set up the SHMLOG_PATH atom.
+ *
+ */
+void update_shmlog_atom(void);
+
 /**
  * Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH)
  *
  */
-void x_set_i3_atoms();
+void x_set_i3_atoms(void);
 
 /**
  * Set warp_to coordinates.  This will trigger on the next call to
@@ -124,5 +129,3 @@ void x_set_warp_to(Rect *rect);
  *
  */
 void x_mask_event_mask(uint32_t mask);
-
-#endif