From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 24 Jan 2006 21:40:53 +0000 (+0000)
Subject: pull in fix from 6.4 branch for XFree86Server definition
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b1dc68662f2a18ea4e02c6d3247c5d1da741aa8;p=mesa.git

pull in fix from 6.4 branch for XFree86Server definition
---

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 1655fd66e6e..7d498a82791 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"