xserver: Branch 'master'

[Eamon Walsh]

 mi/miinitext.c |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit 4be69e41c07b784f75918141eead70415c0ec4a4
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon Feb 11 16:03:25 2008 -0500

    Revert "Bug #8937: Extension setup functions not called on server resets"
    
    This reverts commit 5e946dd853a4ebc2722ae023429ce5797de3d7a6.
    
    The devPrivates rework makes this workaround unnecessary.

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 261fac9..3c55eeb 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -739,16 +739,6 @@ InitExtensions(argc, argv)
 	/* Sort the extensions according the init dependencies. */
 	LoaderSortExtensions();
 	listInitialised = TRUE;
-    } else {
-	/* Call the setup functions on subsequent server resets as well */
-	for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
-	    ext = &ExtensionModuleList[i];
-	    if (ext->setupFunc != NULL &&
-		(ext->disablePtr == NULL ||
-		 (ext->disablePtr != NULL && !*ext->disablePtr))) {
-		(ext->setupFunc)();
-	    }
-	}
     }
 
     for (i = 0; ExtensionModuleList[i].name != NULL; i++) {