xserver: Branch 'master'

[Adam Jackson]

 dix/extension.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae67508392261ae47858692668a0c192ef4a9d7b
Author: Mathieu Bérard <mathieu.berard at crans.org>
Date:   Fri Jul 25 10:05:30 2008 -0400

    Fix AddExtension now that CloseDownProc can be NULL.

diff --git a/dix/extension.c b/dix/extension.c
index 5dbdb95..ccd9362 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -84,7 +84,7 @@ AddExtension(char *name, int NumEvents, int NumErrors,
     int i;
     ExtensionEntry *ext, **newexts;
 
-    if (!MainProc || !SwappedMainProc || !CloseDownProc || !MinorOpcodeProc)
+    if (!MainProc || !SwappedMainProc || !MinorOpcodeProc)
         return((ExtensionEntry *) NULL);
     if ((lastEvent + NumEvents > LAST_EVENT) || 
 	        (unsigned)(lastError + NumErrors > LAST_ERROR))