Module Name: xsrc
Committed By: joerg
Date: Sun Aug 17 22:30:55 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c
Log Message:
CARD32 uses non-canonical typedefs on i386, so explicitly cast to
uint32_t to fix build with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.6 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.7
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.6 Fri Aug 15 15:14:43 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Sun Aug 17 22:30:55 2014
@@ -935,11 +935,11 @@ NVPciProbe(DriverPtr drv, int entity, st
if(name)
xf86DrvMsg(0, X_WARNING,
NV_NAME ": Ignoring unsupported device 0x%"PRIx32" (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n",
- id, name, dev->bus, dev->domain, dev->dev, dev->func);
+ (uint32_t)id, name, dev->bus, dev->domain, dev->dev, dev->func);
else
xf86DrvMsg(0, X_WARNING,
NV_NAME ": Ignoring unsupported device 0x%"PRIx32" at %2.2d@%2.2d:%2.2d:%1.1d\n",
- id, dev->bus, dev->domain, dev->dev, dev->func);
+ (uint32_t)id, dev->bus, dev->domain, dev->dev, dev->func);
return FALSE;
}
