summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2006-01-24 21:40:53 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2006-01-24 21:40:53 +0000
commit8b1dc68662f2a18ea4e02c6d3247c5d1da741aa8 (patch)
tree48b649ef9bbe6f2e3cfd186dd7fcc4b10e78354e /src
parent4dd8a8907e40126e42131a400b59e7d5da5e302a (diff)
pull in fix from 6.4 branch for XFree86Server definition
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/execmem.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 1655fd66e6..7d498a8279 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -36,14 +36,13 @@
-#ifdef __linux__
+#if defined(__linux__) && !defined(XFree86Server)
/*
* Allocate a large block of memory which can hold code then dole it out
* in pieces by means of the generic memory manager code.
*/
-
#include <unistd.h>
#include <sys/mman.h>
#include "mm.h"