xserver: Branch 'glucose-2'

[Jose Fonseca]

 hw/xgl/xglglx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 00d28c084f39e3c2609039b12ac881f76f3e1ed9 (from 41a5aee3859d4d7e648132ed0c4f204084d7c4f0)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Wed Sep 19 11:56:19 2007 +0100

    Dynamically load glxext.so with RTLD_DEEPBIND to avoid picking up duplicate
    symbols from libGL.so.

diff --git a/hw/xgl/xglglx.c b/hw/xgl/xglglx.c
index e45f34e..df328e5 100644
--- a/hw/xgl/xglglx.c
+++ b/hw/xgl/xglglx.c
@@ -157,7 +157,7 @@ xglLoadGLXModules (void)
 	    SYM (__GlxGetMesaProvider, "GlxGetMesaProvider")
 	};
 
-	glXHandle = xglLoadModule ("glxext", RTLD_NOW | RTLD_LOCAL);
+	glXHandle = xglLoadModule ("glxext", RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
 	if (!glXHandle)
 	    return FALSE;