summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2016-03-01 17:03:44 +0100
committerAdam Jackson <ajax@redhat.com>2016-03-01 11:25:59 -0500
commitac4d8c7cee13947b688ebb26035f06f7744db201 (patch)
tree8b0e77dab19aa62acdee02cde60a5bbf9df5f87f /Xext
parent9c88cb9b059111e0531852f3fa8fa571c0306f57 (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>
Diffstat (limited to 'Xext')
-rw-r--r--Xext/vidmode.c4
1 files changed, 4 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 */