Merge branch 'master' into next

[i3/i3] / include / config_directives.h

diff --git a/include/config_directives.h b/include/config_directives.h
index e6b792c463906552711be4788393f21d83098e41..a95a6473f2f8c9ad1b740e38350db1b076de9daa 100644 (file)
--- a/include/config_directives.h
+++ b/include/config_directives.h
@@ -11,6 +11,12 @@
 
 #include "config_parser.h"
 
+/**
+ * A utility function to convert a string of modifiers to the corresponding bit
+ * mask.
+ */
+uint32_t modifiers_from_str(const char *str);
+
 /** The beginning of the prototype for every cfg_ function. */
 #define I3_CFG Match *current_match, struct ConfigResult *result