Merge branch 'backport' into work

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index 7e11545de0d89318631ca9b2c763f6fb10450772..43efd41372c727744e68604cf54c9a5cb262a29d 100644 (file)
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -22,7 +22,6 @@
 #include "window.h"
 #include "geom.h"
 #include "render/render.h"
-#include "parser/parse.h"
 
 #include <glib.h>
 
@@ -169,13 +168,13 @@ void menu_free(ObMenu *menu);
 /*! Repopulate a pipe-menu by running its command */
 void menu_pipe_execute(ObMenu *self);
 /*! Clear a pipe-menu's entries */
-void menu_clear_pipe_caches();
+void menu_clear_pipe_caches(void);
 
 void menu_show_all_shortcuts(ObMenu *self, gboolean show);
 
 void menu_show(gchar *name, gint x, gint y, gboolean mouse,
                struct _ObClient *client);
-gboolean menu_hide_delay_reached();
+gboolean menu_hide_delay_reached(void);
 
 void menu_set_show_func(ObMenu *menu, ObMenuShowFunc func);
 void menu_set_hide_func(ObMenu *menu, ObMenuHideFunc func);