xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 94e7ca6a5667eeb13c078496a07d3e6cf1ec95cc
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Wed Jan 31 17:33:48 2018 +0100

    rrmonitor: allocate using the correct type
    
    Monitor outputs are of type RROutput, not RRCrtc.
    
    (Which are both XID, so this makes no difference in practice, other than
    being technically correct.)
    
    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
index 3f6e03e7d..1bb5018fe 100644
--- a/randr/rrmonitor.c
+++ b/randr/rrmonitor.c
@@ -92,7 +92,7 @@ RRMonitorSetFromServer(RRCrtcPtr crtc, RRMonitorPtr monitor)
     monitor->name = RRMonitorCrtcName(crtc);
     monitor->pScreen = crtc->pScreen;
     monitor->numOutputs = crtc->numOutputs;
-    monitor->outputs = calloc(crtc->numOutputs, sizeof(RRCrtc));
+    monitor->outputs = calloc(crtc->numOutputs, sizeof(RROutput));
     if (!monitor->outputs)
         return FALSE;
     for (o = 0; o < crtc->numOutputs; o++)