xserver: Branch 'master'

[GitLab Mirror]

 fb/fb.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4cd7e2e81924d7fd097c9b17dfe584acc88f2c2b
Author: Sérgio Basto <sergio at serjux.com>
Date:   Thu Oct 10 19:20:00 2024 +0100

    Revert "fb: Declare wfbFinishScreenInit, wfbScreenInit for !FB_ACCESS_WRAPPER"
    
    This reverts commit 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7
    
    Signed-off-by: Sérgio M. Basto <sergio at serjux.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1720>

diff --git a/fb/fb.h b/fb/fb.h
index c2c4cae78..717fea8af 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1030,6 +1030,7 @@ extern _X_EXPORT Bool
                int dpiy, int width,     /* pixel width of frame buffer */
                int bpp);        /* bits per pixel of frame buffer */
 
+#ifdef FB_ACCESS_WRAPPER
 extern _X_EXPORT Bool
 wfbFinishScreenInit(ScreenPtr pScreen,
                     void *pbits,
@@ -1051,6 +1052,7 @@ wfbScreenInit(ScreenPtr pScreen,
               int width,
               int bpp,
               SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
+#endif
 
 extern _X_EXPORT Bool
 fbFinishScreenInit(ScreenPtr pScreen,