summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Brace <kevinbrace@gmx.com>2018-07-11 21:02:37 -0700
committerKevin Brace <kevinbrace@gmx.com>2018-07-11 21:02:37 -0700
commit5559abc347a698ed0baf79ba7d57b4bc0056f33e (patch)
tree884674f0883369a81217bb7064a362f9e7f2345d
parent31f3dd0df2bc855ba9955b588cbcaaa25e3e60d6 (diff)
Add conditional compilation directives to suppress compilation warnings
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
-rw-r--r--src/sis_driver.c4
1 files changed, 4 insertions, 0 deletions
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