git commit f175cf45: vidmode: move to a separate library of its own
introduced a regression where the xserver would not build when xf86vidmodeproto is not installed even if the configure option "--disable-xf86vidmode" is specified. Fix build failure when xf86vidmodeproto is not installed. Signed-off-by: Olivier Fourdan <[email protected]> --- Xext/vidmode.c | 4 ++++ include/vidmodestr.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Xext/vidmode.c b/Xext/vidmode.c index 7ea5ddf..7c838f4 100644 --- a/Xext/vidmode.c +++ b/Xext/vidmode.c @@ -33,6 +33,8 @@ from Kaleb S. KEITHLEY #include <dix-config.h> #endif +#ifdef XF86VIDMODE + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/extensions/xf86vmproto.h> @@ -2145,3 +2147,5 @@ VidModePtr VidModeInit(ScreenPtr pScreen) return VidModeGetPtr(pScreen); } + +#endif /* XF86VIDMODE */ diff --git a/include/vidmodestr.h b/include/vidmodestr.h index 3a44185..b47daa7 100644 --- a/include/vidmodestr.h +++ b/include/vidmodestr.h @@ -133,8 +133,10 @@ typedef struct { VidModeGetGammaRampSizeProcPtr GetGammaRampSize; } VidModeRec, *VidModePtr; +#ifdef XF86VIDMODE void VidModeAddExtension(Bool allow_non_local); VidModePtr VidModeGetPtr(ScreenPtr pScreen); VidModePtr VidModeInit(ScreenPtr pScreen); +#endif /* XF86VIDMODE */ #endif -- 2.5.0 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
