From d4a0bed4b91da9de86c311c7fef9a8aa9a6f500c Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sat, 27 Jul 2019 07:57:27 +0000
Subject: Update to xserver 1.20.5. Tested by jsg@

---
 xserver/hw/xwin/windialogs.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'xserver/hw/xwin/windialogs.c')

diff --git a/xserver/hw/xwin/windialogs.c b/xserver/hw/xwin/windialogs.c
index c83b49bab..26b2ebd2c 100644
--- a/xserver/hw/xwin/windialogs.c
+++ b/xserver/hw/xwin/windialogs.c
@@ -201,18 +201,14 @@ winInitDialog(HWND hwndDlg)
                      0, 0, SWP_NOSIZE | SWP_FRAMECHANGED);
     }
 
-#ifdef XWIN_MULTIWINDOW
     if (g_hIconX)
         hIcon = g_hIconX;
     else
-#endif
         hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
 
-#ifdef XWIN_MULTIWINDOW
     if (g_hSmallIconX)
         hIconSmall = g_hSmallIconX;
     else
-#endif
         hIconSmall = LoadImage(g_hInstance,
                                MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
                                GetSystemMetrics(SM_CXSMICON),
@@ -236,15 +232,11 @@ winDisplayExitDialog(winPrivScreenPtr pScreenPriv)
     for (i = 1; i < currentMaxClients; i++)
         if (clients[i] != NullClient)
             liveClients++;
-#if defined(XWIN_MULTIWINDOW)
     /* Count down server internal clients */
     if (pScreenPriv->pScreenInfo->fMultiWindow)
         liveClients -= 2;       /* multiwindow window manager & XMsgProc  */
-#endif
-#if defined(XWIN_CLIPBOARD)
     if (g_fClipboardStarted)
         liveClients--;          /* clipboard manager */
-#endif
 
     /* A user reported that this sometimes drops below zero. just eye-candy. */
     if (liveClients < 0)
-- 
cgit v1.2.3