Merge branch 'master' into next

[i3/i3] / i3-config-wizard / cfgparse.y

diff --git a/i3-config-wizard/cfgparse.y b/i3-config-wizard/cfgparse.y
index 018b37b2220682efdcd712c4b66d0bdc32eb53d4..bbe119371430b0084605096dd9e0e8293fe824ab 100644 (file)
--- a/i3-config-wizard/cfgparse.y
+++ b/i3-config-wizard/cfgparse.y
@@ -14,6 +14,8 @@
 
 #include <X11/Xlib.h>
 
+#include "libi3.h"
+
 extern Display *dpy;
 
 struct context {
@@ -141,7 +143,7 @@ bindcode:
         char *str = XKeysymToString(sym);
         char *modifiers = modifier_to_string($<number>3);
         // TODO: modifier to string
-        asprintf(&(context->result), "bindsym %s%s %s\n", modifiers, str, $<string>6);
+        sasprintf(&(context->result), "bindsym %s%s %s\n", modifiers, str, $<string>6);
         free(modifiers);
     }
     ;