xserver: Branch 'master'

[Keith Packard]

 mi/miinitext.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 33b94da6327d3423b4ebc1a58d5894c9904e67c9
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Nov 23 16:01:11 2007 -0800

    Re-add call to XFixesExtensionInit for static servers.
    
    This reverts a portion of bcbaf2a0ce34b6c5e41d2831b8b87dbd0617a89b which
    removed the call to XFixesExtensionInit and some cpp lines.

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 11e5bae..f5654f6 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -624,6 +624,10 @@ InitExtensions(argc, argv)
 #endif
 #endif
 #ifdef XFIXES
+    /* must be before Render to layer DisplayCursor correctly */
+    if (!noXFixesExtension) XFixesExtensionInit();
+#endif
+#ifdef RENDER
     if (!noRenderExtension) RenderExtensionInit();
 #endif
 #ifdef RANDR