xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 9ee05c8987245350976ebc0df4953c60da6bcc70
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu Aug 13 13:11:31 2015 +0100

    debug output format fix in RRMonitorCrtcName()
    
    xorg/xserver/randr/rrmonitor.c:35:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘RRCrtc’ [-Werror=format=]
    
    RRCrtc is XID is CARD32, which inside the server is unsigned long or int
    depending on architecture, so a cast is required.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
index 05285dd..c37dcf8 100644
--- a/randr/rrmonitor.c
+++ b/randr/rrmonitor.c
@@ -32,7 +32,7 @@ RRMonitorCrtcName(RRCrtcPtr crtc)
         RROutputPtr     output = crtc->outputs[0];
         return MakeAtom(output->name, output->nameLength, TRUE);
     }
-    sprintf(name, "Monitor-%08x", crtc->id);
+    sprintf(name, "Monitor-%08lx", (unsigned long int)crtc->id);
     return MakeAtom(name, strlen(name), TRUE);
 }