summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Pavlik <rpavlik@iastate.edu>2011-10-27 15:49:59 -0500
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-01-04 17:08:47 +0000
commitf0483db564f414d7785433ff9d7f65ba056304ff (patch)
tree0ac336e09e5e77a5f80eeef13724cda7f81c62c4
parente818d980c0de2a39e0a8a08922b827ed7a35a5dc (diff)
hw/xwin: Fix rrScreenSetSize function pointer mismatch
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. Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-rw-r--r--hw/xwin/winrandr.c2
1 files changed, 0 insertions, 2 deletions
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)
{