xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Helper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

    debug output format fix in xf86Helper.c
    
    xserver/hw/xfree86/common/xf86Helper.c:1834:12: error: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘Atom’ [-Werror=format=]
    xserver/hw/xfree86/common/xf86Helper.c:1834:12: error: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘Atom’ [-Werror=format=]
    
    Atom is unfortunately unsigned long or unsigned int depending on the
    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/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 359bac7..c42e93e 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1831,7 +1831,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
     Bool existing = FALSE;
 
     DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
-           ScrnIndex, property, type, format, len, value);
+           ScrnIndex, (long)property, (long)type, format, len, value);
 
     if (ScrnIndex < 0 || ScrnIndex >= xf86NumScreens) {
         return BadMatch;