Merge branch 'master' into next

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index 740278aecd12eb4bae72c0848d5ec25c474bf28d..3bc425d9c792f4161115c3d6a34ded12642859ac 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -285,7 +285,7 @@ struct Window {
     char *name_json;
 
     /** The length of the name in glyphs (not bytes) */
-    int name_len;
+    size_t name_len;
 
     /** Whether the application used _NET_WM_NAME */
     bool uses_net_wm_name;