From fb3b448df72bc176b8a24a28250495ff2a8c8d2a Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 6 Jun 2024 10:18:17 +0200 Subject: [PATCH] fix FTBS on XSERVER_LIBPCIACCESS Not all Xserver versions define that symbol with a numeric value (1 or 0), some just might not define it at all when disabled. Using #if instead of #ifdef (as most sites do) will lead to compile break: ../../src/sis_driver.c:4008:25: error: expected value in expression #if XSERVER_LIBPCIACCESS ^ Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- src/sis_driver.c | 2 +- src/sis_vga.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sis_driver.c b/src/sis_driver.c index 9eb4217..0a4a552 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -4005,7 +4005,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) biossize = 0x8000; break; } -#if XSERVER_LIBPCIACCESS +#ifdef XSERVER_LIBPCIACCESS if(readpci) { pSiS->PciInfo->rom_size = biossize; pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS); diff --git a/src/sis_vga.c b/src/sis_vga.c index cf17141..8ebdc9b 100644 --- a/src/sis_vga.c +++ b/src/sis_vga.c @@ -1704,7 +1704,7 @@ SiSVGAMapMem(ScrnInfoPtr pScrn) if(pSiS->VGAMapSize == 0) pSiS->VGAMapSize = (64 * 1024); if(pSiS->VGAMapPhys == 0) pSiS->VGAMapPhys = 0xA0000; -#if XSERVER_LIBPCIACCESS +#ifdef XSERVER_LIBPCIACCESS (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize, PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase); #else @@ -1722,7 +1722,7 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn) if(pSiS->VGAMemBase == NULL) return; -#if XSERVER_LIBPCIACCESS +#ifdef XSERVER_LIBPCIACCESS (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize); #else xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);