xserver: Branch 'master'

[Julien Cristau]

 exa/exa.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit b4762c0245ed2966606171cf27f40aa745fdc76e
Author: Julien Cristau <jcristau at debian.org>
Date:   Tue Sep 16 17:13:42 2008 +0200

    exa: disable shared pixmaps
    
    They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6
    ("Reimplement ShmPutImage.")

diff --git a/exa/exa.c b/exa/exa.c
index 1d0d23f..6e769a7 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -42,6 +42,10 @@ DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKeyIndex;
 static int exaPixmapPrivateKeyIndex;
 DevPrivateKey exaPixmapPrivateKey = &exaPixmapPrivateKeyIndex;
 
+#ifdef MITSHM
+static ShmFuncs exaShmFuncs = { NULL, NULL };
+#endif
+
 static _X_INLINE void*
 ExaGetPixmapAddress(PixmapPtr p)
 {
@@ -924,6 +928,12 @@ exaDriverInit (ScreenPtr		pScreen,
     }
 #endif
 
+#ifdef MITSHM
+    /*
+     * Don't allow shared pixmaps.
+     */
+    ShmRegisterFuncs(pScreen, &exaShmFuncs);
+#endif
     /*
      * Hookup offscreen pixmaps
      */