From d0a8d263ac7126b5911a79c7d4374e858954f2b2 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed, 29 Apr 2020 00:07:27 +0800
Subject: [PATCH] gtk/gtkaccelgroup.c: Fix build on Visual Studio

Visual Studio does not allow one to initialize structure members with
non-constant expressions, caused by using strlen(s), so fix this by
using sizeof(s) - 1 instead.
---
 gtk/gtkaccelgroup.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index a941b6055c..b749581629 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -574,18 +574,20 @@ char *
 gtk_accelerator_name (guint           accelerator_key,
                       GdkModifierType accelerator_mods)
 {
+#define TXTLEN(s) sizeof (s) - 1
   static const struct {
     guint mask;
     const char *text;
     gsize text_len;
   } mask_text[] = {
-    { GDK_SHIFT_MASK,   "<Shift>",   strlen ("<Shift>") },
-    { GDK_CONTROL_MASK, "<Control>", strlen ("<Control>") },
-    { GDK_ALT_MASK,     "<Alt>",     strlen ("<Alt>") },
-    { GDK_META_MASK,    "<Meta>",    strlen ("<Meta>") },
-    { GDK_SUPER_MASK,   "<Super>",   strlen ("<Super>") },
-    { GDK_HYPER_MASK,   "<Hyper>",   strlen ("<Hyper>") }
+    { GDK_SHIFT_MASK,   "<Shift>",   TXTLEN ("<Shift>") },
+    { GDK_CONTROL_MASK, "<Control>", TXTLEN ("<Control>") },
+    { GDK_ALT_MASK,     "<Alt>",     TXTLEN ("<Alt>") },
+    { GDK_META_MASK,    "<Meta>",    TXTLEN ("<Meta>") },
+    { GDK_SUPER_MASK,   "<Super>",   TXTLEN ("<Super>") },
+    { GDK_HYPER_MASK,   "<Hyper>",   TXTLEN ("<Hyper>") }
   };
+#undef TXTLEN
   GdkModifierType saved_mods;
   guint l;
   guint name_len;