Merge branch 'master' into next

[i3/i3] / include / ewmh.h

diff --git a/include/ewmh.h b/include/ewmh.h
index aacd1510f5911f26b65e5a59fb645b526319af97..07ef6614a420bf4393202164bcc2b4cf3b5ae884 100644 (file)
--- a/include/ewmh.h
+++ b/include/ewmh.h
@@ -7,8 +7,8 @@
  * ewmh.c: Get/set certain EWMH properties easily.
  *
  */
-#ifndef _EWMH_C
-#define _EWMH_C
+#ifndef I3_EWMH_C
+#define I3_EWMH_C
 
 /**
  * Updates _NET_CURRENT_DESKTOP with the current desktop number.
@@ -17,7 +17,7 @@
  * and _NET_NUMBER_OF_DESKTOPS - 1.
  *
  */
-void ewmh_update_current_desktop();
+void ewmh_update_current_desktop(void);
 
 /**
  * Updates _NET_ACTIVE_WINDOW with the currently focused window.
@@ -44,6 +44,6 @@ void ewmh_update_client_list_stacking(xcb_window_t *stack, int num_windows);
  * Set up the EWMH hints on the root window.
  *
  */
-void ewmh_setup_hints();
+void ewmh_setup_hints(void);
 
 #endif