patches/xf86-video-sis/fix-old-cpp-macros_sis.patch

   1 Upstream: no (Too lazy)
   2 Reason: Fixes build with new GCC by fixing old CPP macros
   3 diff --git a/src/sis_driver.c b/src/sis_driver.c
   4 index 51c9660..5e2eba2 100644
   5 --- a/src/sis_driver.c
   6 +++ b/src/sis_driver.c
   7 @@ -4166,7 +4166,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
   8                               biossize = 0x8000;
   9                               break;
  10              }
  11 -#if XSERVER_LIBPCIACCESS
  12 +#if defined(XSERVER_LIBPCIACCESS)
  13              if(readpci) {
  14                 pSiS->PciInfo->rom_size = biossize;
  15                 pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS);
  16 diff --git a/src/sis_vga.c b/src/sis_vga.c
  17 index 8b625d2..c40c140 100644
  18 --- a/src/sis_vga.c
  19 +++ b/src/sis_vga.c
  20 @@ -1715,7 +1715,7 @@ SiSVGAMapMem(ScrnInfoPtr pScrn)
  21      if(pSiS->VGAMapPhys == 0) pSiS->VGAMapPhys = 0xA0000;
  22
  23  #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
  24 -#if XSERVER_LIBPCIACCESS
  25 +#if defined(XSERVER_LIBPCIACCESS)
  26      (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize,
  27                                   PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase);
  28  #else
  29 @@ -1737,7 +1737,7 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn)
  30
  31      if(pSiS->VGAMemBase == NULL) return;
  32
  33 -#if XSERVER_LIBPCIACCESS
  34 +#if defined(XSERVER_LIBPCIACCESS)
  35      (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize);
  36  #else
  37      xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);
  38