xf86-video-ati: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Sat Feb 26 06:30:22 PST 2011
src/radeon_kms.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit e55520c0e582f2a500b3b01c2cb78750e15256ca
Author: Michel Dänzer <daenzer at vmware.com>
Date: Sat Feb 26 15:27:59 2011 +0100
Revert "kms: Fix warning XNFprintf is deprecated"
This reverts commit cb4dc7ab66016d0c980800f8dbf71bbe993889d3.
Looks like this caused https://bugs.freedesktop.org/attachment.cgi?id=43852 ,
but even if it didn't, the following needs to be addressed first:
cc1: warnings being treated as errors
../../src/radeon_kms.c: In function âradeon_open_drm_masterâ:
../../src/radeon_kms.c:413: error: passing argument 1 of âXNFasprintfâ from incompatible pointer type
/usr/local/include/xorg/Xprintf.h:57: note: expected âchar **â but argument is of type âchar *â
../../src/radeon_kms.c:413: error: passing argument 2 of âXNFasprintfâ makes pointer from integer without a cast
/usr/local/include/xorg/Xprintf.h:57: note: expected âconst char * restrictâ but argument is of type âuint16_tâ
../../src/radeon_kms.c:413: error: assignment makes pointer from integer without a cast
make[2]: *** [radeon_kms.lo] Error 1
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 82ee660..158dc57 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -408,13 +408,9 @@ static Bool radeon_open_drm_master(ScrnInfoPtr pScrn)
info->dri2.drm_fd = pRADEONEnt->fd;
goto out;
}
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
- busid = XNFasprintf("pci:%04x:%02x:%02x.%d",
- dev->domain, dev->bus, dev->dev, dev->func);
-#else
+
busid = XNFprintf("pci:%04x:%02x:%02x.%d",
dev->domain, dev->bus, dev->dev, dev->func);
-#endif
info->dri2.drm_fd = drmOpen("radeon", busid);
if (info->dri2.drm_fd == -1) {
More information about the xorg-commit
mailing list