mesa: Branch 'master'

[George Sapountzis]

 src/mesa/main/execmem.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 20ec486baf6ee0909294e15550773f57f0789ec7 (from 55000888b9d1dcbf477d23afd16974450828a143)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Sat Apr 7 18:41:14 2007 +0300

    Drop XFree86Server from execmem.c
    
    This is a remnant from the libcwrapper days that can be removed now. It is the
    last XFree86 glitch in Mesa core.
    
    Reverts the following commit (thanks to Brian Paul for pointing to it):
    
    commit 8b1dc68662f2a18ea4e02c6d3247c5d1da741aa8
    Author: Alan Hourihane <alanh at tungstengraphics.com>
    Date:   Tue Jan 24 21:40:53 2006 +0000
    
        pull in fix from 6.4 branch for XFree86Server definition
    
    commit cc7b6810e2fe6ab485fd96d5f17bf5d9329bd153
    Author: Ian Romanick <idr at us.ibm.com>
    Date:   Fri Oct 21 18:09:24 2005 +0000
    
        Make execmem.c compile in the server (libGLcore).  Since xf86mmap
        doesn't know about MAP_ANONYMOUS, this is the only viable fix.  This
        issue will likely have to be revisited at some point.

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index b7cbc81..df30952 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -36,7 +36,7 @@
 
 
 
-#if defined(__linux__) && !defined(XFree86Server)
+#if defined(__linux__)
 
 /*
  * Allocate a large block of memory which can hold code then dole it out