xserver: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Apr 19 15:33:34 UTC 2023


 fb/fb.h |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7
Author: Florian Weimer <fweimer at redhat.com>
Date:   Thu Apr 13 15:45:58 2023 +0200

    fb: Declare wfbFinishScreenInit, wfbScreenInit for !FB_ACCESS_WRAPPER
    
    xf86-video-nouveau calls wfbScreenInit without defining
    FB_ACCESS_WRAPPER (which has other unintended side effects).
    Presently, this compiles and links because compilers still support
    implicit function declarations, but this is going to change fairly
    soon.  This seems to be the most straightforward change to keep
    the driver building.

diff --git a/fb/fb.h b/fb/fb.h
index 08143a0d4..309f15294 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1027,7 +1027,6 @@ 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,
@@ -1049,7 +1048,6 @@ wfbScreenInit(ScreenPtr pScreen,
               int width,
               int bpp,
               SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
-#endif
 
 extern _X_EXPORT Bool
 fbFinishScreenInit(ScreenPtr pScreen,


More information about the xorg-commit mailing list