xserver: Branch 'master'

[Keith Packard]

 randr/rrcrtc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21eec367d0d9c142458f973062e17add4f693033
Author: Nicolas Kaiser <nikai at nikai.net>
Date:   Mon Jun 6 16:53:41 2011 +0200

    randr: void function cannot return value
    
    Providing an argument to return in a function with void return type
    is not allowed by the C standard, and makes the Sun compilers unhappy.
    
    Signed-off-by: Nicolas Kaiser <nikai at nikai.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index d4d8f2a..0437795 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -632,7 +632,7 @@ RRModeGetScanoutSize (RRModePtr mode, PictTransformPtr transform,
 void
 RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height)
 {
-    return RRModeGetScanoutSize (crtc->mode, &crtc->transform, width, height);
+    RRModeGetScanoutSize (crtc->mode, &crtc->transform, width, height);
 }
 
 /*