frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Olivier Fourdan 2016-03-01 17:03:44 +01:00 committed by Adam Jackson
parent 9c88cb9b05
commit ac4d8c7cee
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/vidmode.c
View File

@ -33,6 +33,8 @@ from Kaleb S. KEITHLEY
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef XF86VIDMODE
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/extensions/xf86vmproto.h> #include <X11/extensions/xf86vmproto.h>
@ -2145,3 +2147,5 @@ VidModePtr VidModeInit(ScreenPtr pScreen)
return VidModeGetPtr(pScreen); return VidModeGetPtr(pScreen);
} }
#endif /* XF86VIDMODE */

2
include/vidmodestr.h
View File

@ -133,8 +133,10 @@ typedef struct {
VidModeGetGammaRampSizeProcPtr GetGammaRampSize; VidModeGetGammaRampSizeProcPtr GetGammaRampSize;
} VidModeRec, *VidModePtr; } VidModeRec, *VidModePtr;
#ifdef XF86VIDMODE
void VidModeAddExtension(Bool allow_non_local); void VidModeAddExtension(Bool allow_non_local);
VidModePtr VidModeGetPtr(ScreenPtr pScreen); VidModePtr VidModeGetPtr(ScreenPtr pScreen);
VidModePtr VidModeInit(ScreenPtr pScreen); VidModePtr VidModeInit(ScreenPtr pScreen);
#endif /* XF86VIDMODE */
#endif #endif