summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2023-04-13 15:45:58 +0200
committerAdam Jackson <ajax@nwnk.net>2023-04-19 15:27:26 +0000
commit34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7 (patch)
tree5bacff4f80031f9364f0985afe225ce212e181cc
parent636c9aa359eab45102c12a9fccb8f60587c7d485 (diff)
downloadxserver-34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7.tar.gz
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.
-rw-r--r--fb/fb.h2
1 files changed, 0 insertions, 2 deletions
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,