Move STRINGIFY to utils.h and add STRINGIFY2

src/utils.h

@@ -62,6 +62,9 @@
 /* Round up @a so it's divisible by @b. */
 #define ROUNDUP(a, b) (((a) + (b) - 1) / (b) * (b))
 
+#define STRINGIFY(x) #x
+#define STRINGIFY2(x) STRINGIFY(x)
+
 char
 to_lower(char c);
 

src/x11/keymap.c

@@ -61,7 +61,6 @@
  * We try not to trust the server too much and be paranoid. If we get
  * something which we definitely shouldn't, we fail.
  */
-#define STRINGIFY(expr) #expr
 #define FAIL_UNLESS(expr) do {                                          \
     if (!(expr)) {                                                      \
         log_err(keymap->ctx,                                            \