[Spice-devel] [PATCH xf86-qxl 02/27] uxa: fix bad argument type from removed index API change (s/SCREEN_ARG_TYPE/SCRN_ARG_TYPE/)

[Marc-André Lureau]

From: Alon Levy <alevy at redhat.com>

---
 src/uxa/uxa-priv.h |    2 +-
 src/uxa/uxa.c      |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h
index 7a3c85e..ad83963 100644
--- a/src/uxa/uxa-priv.h
+++ b/src/uxa/uxa-priv.h
@@ -111,7 +111,7 @@ typedef struct {
 
 #define UXA_NUM_SOLID_CACHE 16
 
-typedef void (*EnableDisableFBAccessProcPtr) (SCREEN_ARG_TYPE, Bool);
+typedef void (*EnableDisableFBAccessProcPtr) (SCRN_ARG_TYPE, Bool);
 typedef struct {
 	uxa_driver_t *info;
 	CreateGCProcPtr SavedCreateGC;
diff --git a/src/uxa/uxa.c b/src/uxa/uxa.c
index 8b165a8..5570078 100644
--- a/src/uxa/uxa.c
+++ b/src/uxa/uxa.c
@@ -359,9 +359,10 @@ static RegionPtr uxa_bitmap_to_region(PixmapPtr pPix)
 	return ret;
 }
 
-static void uxa_xorg_enable_disable_fb_access(SCREEN_ARG_TYPE arg, Bool enable)
+static void uxa_xorg_enable_disable_fb_access(SCRN_ARG_TYPE arg, Bool enable)
 {
-	SCREEN_PTR(arg);
+	SCRN_INFO_PTR(arg);
+	ScreenPtr pScreen = pScrn->pScreen;
 	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
 
 	if (!enable && uxa_screen->disableFbCount++ == 0)
-- 
1.7.10.4