[PATCH xf86-video-sis 1/2] Add conditional compilation directives to suppress compilation warnings

Kevin Brace kevinbrace at gmx.com
Thu Jul 12 04:48:44 UTC 2018


Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
---
 src/sis_driver.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index 4e51e2e..31a7ada 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -9316,7 +9316,9 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
   int		CRT1XOffs = 0, CRT1YOffs = 0, CRT2XOffs = 0, CRT2YOffs = 0;
   int		HVirt = pScrn1->virtualX;
   int		VVirt = pScrn1->virtualY;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20
   int		sigstate;
+#endif
   Bool		doit = FALSE, HaveNonRect = FALSE, HaveOffsRegions = FALSE;
   SiSScrn2Rel   srel = ((SiSMergedDisplayModePtr)pSiS->CurrentLayout.mode->Private)->CRT2Position;
 
@@ -13997,9 +13999,11 @@ UChar
 SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort offset, UChar value)
 {
     UChar ret = 0;
+#ifndef XSERVER_LIBPCIACCESS
 #ifdef SIS_USE_BIOS_SCRATCH
     UChar *base;
 #endif
+#endif
 
     /* For some reasons (like detecting the current display mode),
      * we need to read (or write-back) values from the BIOS
-- 
2.7.4



More information about the xorg-devel mailing list