summaryrefslogtreecommitdiff
path: root/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-01-10 08:46:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-01-10 18:53:03 +0100
commit8f334ab4d02f9568e1380d9e88bf1179cffcd115 (patch)
treea71df5200ffa2e3976a3814d55cf35c95b533d31 /package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
parenta1cf26c948c232d2f9653d2094c8009909d80e5b (diff)
libXScrnsaver: disable malloc0returnsnull
Diffstat (limited to 'package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c')
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
index 843cc145b..a3929d9f9 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -1,6 +1,6 @@
---- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_video.c 2013-12-27 18:38:52.000000000 +0100
-+++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_video.c 2014-03-21 13:14:06.821293270 +0100
-@@ -473,7 +473,7 @@ unmapVidMem(int ScreenNum, pointer Base,
+--- xorg-server-1.18.0.orig/hw/xfree86/os-support/linux/lnx_video.c 2015-08-03 16:44:08.000000000 +0200
++++ xorg-server-1.18.0/hw/xfree86/os-support/linux/lnx_video.c 2016-01-08 01:41:49.618324040 +0100
+@@ -79,7 +79,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
/* I/O Permissions section */
/***************************************************************************/
@@ -9,7 +9,7 @@
volatile unsigned char *ioBase = NULL;
#ifndef __NR_pciconfig_iobase
-@@ -484,7 +484,11 @@ static Bool
+@@ -90,7 +90,11 @@ static Bool
hwEnableIO(void)
{
int fd;