From 8b1dc68662f2a18ea4e02c6d3247c5d1da741aa8 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 24 Jan 2006 21:40:53 +0000
Subject: pull in fix from 6.4 branch for XFree86Server definition

---
 src/mesa/main/execmem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/mesa')

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"
-- 
cgit v1.2.3