From 5c35dd7be716a3464f012c92866919a3606f9beb Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 27 Oct 2011 15:49:59 -0500 Subject: hw/xwin: Fix rrScreenSetSize function pointer mismatch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winrandr.c: In function ‘winRandRInit’: winrandr.c:218:31: warning: assignment from incompatible pointer type Fix winRandRScreenSetSize() function signature to match RRScreenSetSizeProcPtr type, to align with commit fd9331f6 'Revert "Separate out screen size and screen pixmap sizes in RRScreenSizeSet"' This is fall-out from the late revert of RANDR 1.4 in the 1.10 release cycle, it will probably need to be reverted if/when that goes back in again. Signed-off-by: Ryan Pavlik Reviewed-by: Colin Harrison Reviewed-by: Jon TURNEY --- hw/xwin/winrandr.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'hw/xwin') diff --git a/hw/xwin/winrandr.c b/hw/xwin/winrandr.c index c58119360..596c1ab9d 100644 --- a/hw/xwin/winrandr.c +++ b/hw/xwin/winrandr.c @@ -122,8 +122,6 @@ Bool winRandRScreenSetSize (ScreenPtr pScreen, CARD16 width, CARD16 height, - CARD16 pixWidth, - CARD16 pixHeight, CARD32 mmWidth, CARD32 mmHeight) { -- cgit v1.2.3