3 files changed, 19 insertions, 20 deletions
diff --git a/xorg-server/composite/Makefile.am b/xorg-server/composite/Makefile.am
index c2f5123f2..a7c0804e8 100644
--- a/xorg-server/composite/Makefile.am
+++ b/xorg-server/composite/Makefile.am
@@ -1,15 +1,15 @@
-noinst_LTLIBRARIES = libcomposite.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = compositeext.h
-endif
-
-libcomposite_la_SOURCES = 	\
-	compalloc.c		\
-	compext.c		\
-	compint.h		\
-	compinit.c		\
-	compoverlay.c		\
-	compwindow.c		
+noinst_LTLIBRARIES = libcomposite.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = compositeext.h
+endif
+
+libcomposite_la_SOURCES = 	\
+	compalloc.c		\
+	compext.c		\
+	compint.h		\
+	compinit.c		\
+	compoverlay.c		\
+	compwindow.c		
diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index e85ade0f0..f79f5f96c 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -55,14 +55,13 @@ compScreenUpdate(ScreenPtr pScreen)
 }
 
 static void
-compBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+compBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[i];
     CompScreenPtr cs = GetCompScreen(pScreen);
 
     pScreen->BlockHandler = cs->BlockHandler;
     compScreenUpdate(pScreen);
-    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
 
     /* Next damage will restore the block handler */
     cs->BlockHandler = NULL;
diff --git a/xorg-server/composite/compinit.c b/xorg-server/composite/compinit.c
index eaa125681..bc1130e78 100644
--- a/xorg-server/composite/compinit.c
+++ b/xorg-server/composite/compinit.c
@@ -53,7 +53,7 @@ DevPrivateKeyRec CompWindowPrivateKeyRec;
 DevPrivateKeyRec CompSubwindowsPrivateKeyRec;
 
 static Bool
-compCloseScreen(int index, ScreenPtr pScreen)
+compCloseScreen(ScreenPtr pScreen)
 {
     CompScreenPtr cs = GetCompScreen(pScreen);
     Bool ret;
@@ -82,7 +82,7 @@ compCloseScreen(int index, ScreenPtr pScreen)
 
     free(cs);
     dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);
-    ret = (*pScreen->CloseScreen) (index, pScreen);
+    ret = (*pScreen->CloseScreen) (pScreen);
 
     return ret;
 }