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 1655fd66e6e8f668876d541f75b4280c7d65239c..7d498a82791f66ecbb5d96184538ad4073669296 100644 (file)
--- 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"