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:
		
							parent
							
								
									9c88cb9b05
								
							
						
					
					
						commit
						ac4d8c7cee
					
				|  | @ -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 */ | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue