Merge branch 'master' into next

[i3/i3] / i3-nagbar / i3-nagbar.h

diff --git a/i3-nagbar/i3-nagbar.h b/i3-nagbar/i3-nagbar.h
index 951e264fd7d0db9b6499057339fd0fceebd2a1d6..379a7f6f7e4b67a49f0a1c0652234447cc258bc1 100644 (file)
--- a/i3-nagbar/i3-nagbar.h
+++ b/i3-nagbar/i3-nagbar.h
@@ -1,5 +1,5 @@
-#ifndef _I3_NAGBAR
-#define _I3_NAGBAR
+#ifndef I3_NAGBAR
+#define I3_NAGBAR
 
 #include <err.h>
 
@@ -18,7 +18,4 @@ while (0)
 
 extern xcb_window_t root;
 
-xcb_window_t open_input_window(xcb_connection_t *conn, uint32_t width, uint32_t height);
-int get_font_id(xcb_connection_t *conn, char *pattern, int *font_height);
-
 #endif