summaryrefslogtreecommitdiff
path: root/src/radeon_kms.c
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2011-02-26 15:27:59 +0100
committerMichel Dänzer <michel@daenzer.net>2011-02-26 15:27:59 +0100
commite55520c0e582f2a500b3b01c2cb78750e15256ca (patch)
tree259c96af176ab9686dfdd3c8ef23113791801fc5 /src/radeon_kms.c
parentcb4dc7ab66016d0c980800f8dbf71bbe993889d3 (diff)
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
Diffstat (limited to 'src/radeon_kms.c')
-rw-r--r--src/radeon_kms.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 82ee6603..158dc57c 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) {