summaryrefslogtreecommitdiff
path: root/x11/XFree86/files/patch-04
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2000-01-12 03:49:50 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2000-01-12 03:49:50 +0000
commitcd7d36b7f310b928e6ca693f49f4b2a04754107a (patch)
tree2b0f673e8be97437ec1b4654595b733b1d2e53e3 /x11/XFree86/files/patch-04
parentUpgrade to version 3.3.6 (threads support is already included) (diff)
Upgrade to version 3.3.6
patch-4 has been split into several parts (patch-0?); one patch per modified file
Diffstat (limited to 'x11/XFree86/files/patch-04')
-rw-r--r--x11/XFree86/files/patch-0421
1 files changed, 21 insertions, 0 deletions
diff --git a/x11/XFree86/files/patch-04 b/x11/XFree86/files/patch-04
new file mode 100644
index 000000000000..45d6465c8354
--- /dev/null
+++ b/x11/XFree86/files/patch-04
@@ -0,0 +1,21 @@
+diff -ur /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c programs/Xserver/hw/xfree86/accel/s3/s3.c
+--- /usr/ports/x11/XFree86/work/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c Mon Oct 19 21:39:13 1998
++++ programs/Xserver/hw/xfree86/accel/s3/s3.c Wed Dec 9 10:27:41 1998
+@@ -291,7 +291,7 @@
+ int s3_968_DashBug = 0;
+ unsigned long s3MemBase = 0;
+ Bool tmp_useSWCursor = FALSE;
+-#ifdef __alpha__
++#if defined(__alpha__) && defined(linux)
+ unsigned long _bus_base(void);
+ Bool isJensen = FALSE;
+ #endif
+@@ -1034,7 +1034,7 @@
+
+ xf86VerifyOptions(&validOptions, &s3InfoRec);
+
+-#ifdef __alpha__
++#if defined(__alpha__) && defined(linux)
+ #ifdef TEST_JENSEN_CODE
+ if (1)
+ #else