xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/dri/dri.c |    4 +++-
 hw/xfree86/dri/dri.h |    2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 73cf8d356061e0a2deca8c09d1030be8ceea2356
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Sep 24 16:18:13 2024 +0200

    xfree86: dri: unexport DRIDestroyWindow() and make it static
    
    This function is only called inside dri.c, not used by any drivers
    (and wouldn't make sense to do so), so no need to keep it exported.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1713>

diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index dfc33f33d..64a483d49 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -634,6 +634,8 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
     return TRUE;
 }
 
+static Bool DRIDestroyWindow(WindowPtr pWin);
+
 Bool
 DRIFinishScreenInit(ScreenPtr pScreen)
 {
@@ -1920,7 +1922,7 @@ DRITreeTraversal(WindowPtr pWin, void *data)
     return WT_WALKCHILDREN;
 }
 
-Bool
+static Bool
 DRIDestroyWindow(WindowPtr pWin)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h
index 2ec1c76ea..6e09048f4 100644
--- a/hw/xfree86/dri/dri.h
+++ b/hw/xfree86/dri/dri.h
@@ -277,8 +277,6 @@ extern _X_EXPORT void *DRIGetContextStore(DRIContextPrivPtr context);
 
 extern _X_EXPORT void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn);
 
-extern _X_EXPORT Bool DRIDestroyWindow(WindowPtr pWin);
-
 extern _X_EXPORT void DRICopyWindow(WindowPtr pWin,
                                     DDXPointRec ptOldOrg, RegionPtr prgnSrc);