aboutsummaryrefslogtreecommitdiffstats
path: root/community/xf86-video-sis/fix-old-cpp-macros.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/xf86-video-sis/fix-old-cpp-macros.patch')
-rw-r--r--community/xf86-video-sis/fix-old-cpp-macros.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/community/xf86-video-sis/fix-old-cpp-macros.patch b/community/xf86-video-sis/fix-old-cpp-macros.patch
new file mode 100644
index 0000000000..26ec869a73
--- /dev/null
+++ b/community/xf86-video-sis/fix-old-cpp-macros.patch
@@ -0,0 +1,38 @@
+Upstream: no (Too lazy)
+Reason: Fixes build with new GCC by fixing old CPP macros
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 51c9660..5e2eba2 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -4166,7 +4166,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ biossize = 0x8000;
+ break;
+ }
+-#if XSERVER_LIBPCIACCESS
++#if defined(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 8b625d2..c40c140 100644
+--- a/src/sis_vga.c
++++ b/src/sis_vga.c
+@@ -1715,7 +1715,7 @@ SiSVGAMapMem(ScrnInfoPtr pScrn)
+ if(pSiS->VGAMapPhys == 0) pSiS->VGAMapPhys = 0xA0000;
+
+ #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
+-#if XSERVER_LIBPCIACCESS
++#if defined(XSERVER_LIBPCIACCESS)
+ (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase);
+ #else
+@@ -1737,7 +1737,7 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn)
+
+ if(pSiS->VGAMemBase == NULL) return;
+
+-#if XSERVER_LIBPCIACCESS
++#if defined(XSERVER_LIBPCIACCESS)
+ (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize);
+ #else
+ xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);
+