xserver: Branch 'server-1.10-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Mon Jun 6 09:39:22 PDT 2011
randr/rrcrtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit caaf263b93b17367a96483dec73573415ead9b14
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>
(cherry picked from commit 21eec367d0d9c142458f973062e17add4f693033)
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 98206a2..31c9510 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -538,7 +538,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);
}
/*
More information about the xorg-commit
mailing list