From 1d1ae20e759ce7702281bd2b507287dc088d987c Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 16 Jul 2025 12:03:32 +0200 Subject: [PATCH] xwin: use NULL instead of NullClient No need to have another name for NULL, we can use NULL directly. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xwin/glx/indirect.c | 2 +- hw/xwin/wincmap.c | 2 +- hw/xwin/windialogs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index eb30ae99f..102e157dd 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -734,7 +734,7 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) GLWIN_TRACE_MSG("glxWinCopyWindow pWindow %p", pWindow); dixLookupResourceByType((void *) &pGlxDraw, pWindow->drawable.id, - __glXDrawableRes, NullClient, DixUnknownAccess); + __glXDrawableRes, NULL, DixUnknownAccess); /* Discard any CopyWindow requests if a GL drawing context is pointing at the window diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index 679b4d34c..aa5b271e5 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -180,7 +180,7 @@ winUninstallColormap(ColormapPtr pmap) /* Install the default cmap in place of the cmap to be uninstalled */ if (pmap->mid != pmap->pScreen->defColormap) { dixLookupResourceByType((void *) &curpmap, pmap->pScreen->defColormap, - X11_RESTYPE_COLORMAP, NullClient, DixUnknownAccess); + X11_RESTYPE_COLORMAP, NULL, DixUnknownAccess); (*pmap->pScreen->InstallColormap) (curpmap); } } diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c index 91222f5a2..3414418bc 100644 --- a/hw/xwin/windialogs.c +++ b/hw/xwin/windialogs.c @@ -230,7 +230,7 @@ winDisplayExitDialog(winPrivScreenPtr pScreenPriv) /* Count up running clients (clients[0] is serverClient) */ for (i = 1; i < currentMaxClients; i++) - if (clients[i] != NullClient) + if (clients[i] != NULL) liveClients++; /* Count down server internal clients */ if (pScreenPriv->pScreenInfo->fMultiWindow)