diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2016-03-01 17:03:44 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-03-01 11:25:59 -0500 |
| commit | ac4d8c7cee13947b688ebb26035f06f7744db201 (patch) | |
| tree | 8b0e77dab19aa62acdee02cde60a5bbf9df5f87f | |
| parent | 9c88cb9b059111e0531852f3fa8fa571c0306f57 (diff) | |
vidmode: build without xf86vidmodeproto
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.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
| -rw-r--r-- | Xext/vidmode.c | 4 | ||||
| -rw-r--r-- | include/vidmodestr.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Xext/vidmode.c b/Xext/vidmode.c index 7ea5ddfb5..7c838f449 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 3a4418501..b47daa779 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 |