1 files changed, 6 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index 57825af72..5d36aa89f 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -81,7 +81,8 @@ WinCmdlineRec g_cmdline = {
     0                           /* emulate3Timeout */
 };
 
-winInfoRec g_winInfo = {
+winInfoRec
+g_winInfo = {
     {                           /* keyboard */
      0,                         /* leds */
      500,                       /* delay */
@@ -335,10 +336,10 @@ winConfigKeyboard(DeviceIntPtr pDevice)
                    pLayout->xkbvariant ? pLayout->xkbvariant : "none",
                    pLayout->xkboptions ? pLayout->xkboptions : "none");
 
-            g_winInfo.xkb.model = pLayout->xkbmodel;
-            g_winInfo.xkb.layout = pLayout->xkblayout;
-            g_winInfo.xkb.variant = pLayout->xkbvariant;
-            g_winInfo.xkb.options = pLayout->xkboptions;
+            g_winInfo.xkb.model = (char *)pLayout->xkbmodel;
+            g_winInfo.xkb.layout = (char *)pLayout->xkblayout;
+            g_winInfo.xkb.variant = (char *)pLayout->xkbvariant;
+            g_winInfo.xkb.options = (char *)pLayout->xkboptions;
 
             break;
         }