1 files changed, 11 insertions, 13 deletions
diff --git a/src/lx_video.c b/src/lx_video.c
index eb46cb5..a941557 100644
--- a/src/lx_video.c
+++ b/src/lx_video.c
@@ -39,7 +39,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86fbman.h"
 #include "regionstr.h"
@@ -85,9 +84,9 @@ static XF86VideoFormatRec Formats[] = {
 };
 
 static XF86AttributeRec Attributes[] = {
-    {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
-    {XvSettable | XvGettable, 0, 1, "XV_FILTER"},
-    {XvSettable | XvGettable, 0, 1, "XV_COLORKEYMODE"}
+    {XvSettable | XvGettable, 0, (1 << 24) - 1, (char *)"XV_COLORKEY"},
+    {XvSettable | XvGettable, 0, 1, (char *)"XV_FILTER"},
+    {XvSettable | XvGettable, 0, 1, (char *)"XV_COLORKEYMODE"}
 };
 
 static XF86ImageRec Images[] = {
@@ -643,14 +642,13 @@ LXResetVideo(ScrnInfoPtr pScrni)
 static void
 LXVidBlockHandler(BLOCKHANDLER_ARGS_DECL)
 {
-    SCREEN_PTR(arg);
-    ScrnInfoPtr pScrni = xf86ScreenToScrn(pScrn);
+    ScrnInfoPtr pScrni = xf86ScreenToScrn(pScreen);
     GeodeRec *pGeode = GEODEPTR(pScrni);
     GeodePortPrivRec *pPriv = GET_PORT_PRIVATE(pScrni);
 
-    pScrn->BlockHandler = pGeode->BlockHandler;
-    (*pScrn->BlockHandler) (BLOCKHANDLER_ARGS);
-    pScrn->BlockHandler = LXVidBlockHandler;
+    pScreen->BlockHandler = pGeode->BlockHandler;
+    (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+    pScreen->BlockHandler = LXVidBlockHandler;
 
     if (pPriv->videoStatus & TIMER_MASK) {
         Time now = currentTime.milliseconds;
@@ -685,9 +683,9 @@ LXVidBlockHandler(BLOCKHANDLER_ARGS_DECL)
 }
 
 static XF86VideoAdaptorPtr
-LXSetupImageVideo(ScreenPtr pScrn)
+LXSetupImageVideo(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrni = xf86ScreenToScrn(pScrn);
+    ScrnInfoPtr pScrni = xf86ScreenToScrn(pScreen);
     GeodeRec *pGeode = GEODEPTR(pScrni);
     XF86VideoAdaptorPtr adapt;
     GeodePortPrivRec *pPriv;
@@ -741,8 +739,8 @@ LXSetupImageVideo(ScreenPtr pScrn)
 
     pGeode->adaptor = adapt;
 
-    pGeode->BlockHandler = pScrn->BlockHandler;
-    pScrn->BlockHandler = LXVidBlockHandler;
+    pGeode->BlockHandler = pScreen->BlockHandler;
+    pScreen->BlockHandler = LXVidBlockHandler;
 
     xvColorKey = MAKE_ATOM("XV_COLORKEY");
     xvColorKeyMode = MAKE_ATOM("XV_COLORKEYMODE");