summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-03-26 03:36:47 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-03-26 03:36:47 +0800
commit8afe8fe8b1435f3017db76e50f1f481af031dfdd (patch)
tree90a74b7a8c208346a39fb4eccc779df9ca60092a
parentc4d4dcd901acc36e59ea9c16d208e65487f144b0 (diff)
downloadxorg-devel-ports-8afe8fe8b1435f3017db76e50f1f481af031dfdd.tar.gz
xorg-devel-ports-8afe8fe8b1435f3017db76e50f1f481af031dfdd.tar.zst
xorg-devel-ports-8afe8fe8b1435f3017db76e50f1f481af031dfdd.zip
Merge r770:
Fix build on i386 when built with gcc. Obtained from: freedesktop.org git repo git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@771 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--x11/libXxf86dga/files/patch-src_XF86DGA.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/x11/libXxf86dga/files/patch-src_XF86DGA.c b/x11/libXxf86dga/files/patch-src_XF86DGA.c
new file mode 100644
index 0000000..90768c9
--- /dev/null
+++ b/x11/libXxf86dga/files/patch-src_XF86DGA.c
@@ -0,0 +1,20 @@
+--- src/XF86DGA2.c.orig 2013-03-25 20:23:42.796859881 +0100
++++ src/XF86DGA.c 2013-03-25 20:23:17.997856725 +0100
+@@ -21,6 +21,8 @@
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+
++#include <stdint.h>
++
+
+ /* If you change this, change the Bases[] array below as well */
+ #define MAX_HEADS 16
+@@ -928,7 +930,7 @@
+ if ((pMap->fd = open(name, O_RDWR)) < 0)
+ return False;
+ pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
+ if (pMap->virtual == (void *)-1)
+ return False;
+ mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);