geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: use c99 __func__ over __FUNCTION__ 

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
main
Emil Velikov 2015-04-05 16:50:33 +01:00
parent e59f00fb43
commit 41eb131dfe
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intel/intel_bufmgr_fake.c
View File

@ -52,11 +52,6 @@
#include "libdrm_macros.h"
#include "libdrm_lists.h"
/* Support gcc's __FUNCTION__ for people using other compilers */
#if !defined(__GNUC__) && !defined(__FUNCTION__)
# define __FUNCTION__ __func__ /* C99 */
#endif
#define DBG(...) do { \
if (bufmgr_fake->bufmgr.debug) \
drmMsg(__VA_ARGS__); \
@ -278,7 +273,7 @@ _fence_emit_internal(drm_intel_bufmgr_fake *bufmgr_fake)
ret = drmCommandWriteRead(bufmgr_fake->fd, DRM_I915_IRQ_EMIT,
&ie, sizeof(ie));
if (ret) {
drmMsg("%s: drm_i915_irq_emit: %d\n", __FUNCTION__, ret);
drmMsg("%s: drm_i915_irq_emit: %d\n", __func__, ret);
abort();
}
@ -545,7 +540,7 @@ evict_lru(drm_intel_bufmgr_fake *bufmgr_fake, unsigned int max_fence)
{
struct block *block, *tmp;
DBG("%s\n", __FUNCTION__);
DBG("%s\n", __func__);
DRMLISTFOREACHSAFE(block, tmp, &bufmgr_fake->lru) {
drm_intel_bo_fake *bo_fake = (drm_intel_bo_fake *) block->bo;
@ -572,7 +567,7 @@ evict_mru(drm_intel_bufmgr_fake *bufmgr_fake)
{
struct block *block, *tmp;
DBG("%s\n", __FUNCTION__);
DBG("%s\n", __func__);
DRMLISTFOREACHSAFEREVERSE(block, tmp, &bufmgr_fake->lru) {
drm_intel_bo_fake *bo_fake = (drm_intel_bo_fake *) block->bo;
@ -632,7 +627,7 @@ clear_fenced(drm_intel_bufmgr_fake *bufmgr_fake, unsigned int fence_cookie)
}
}
DBG("%s: %d\n", __FUNCTION__, ret);
DBG("%s: %d\n", __func__, ret);
return ret;
}
@ -717,7 +712,7 @@ evict_and_alloc_block(drm_intel_bo *bo)
if (alloc_block(bo))
return 1;
DBG("%s 0x%lx bytes failed\n", __FUNCTION__, bo->size);
DBG("%s 0x%lx bytes failed\n", __func__, bo->size);
return 0;
}
@ -1027,12 +1022,12 @@ static int
bo_fake->name, bo_fake->bo.size / 1024);
if (bo->virtual != NULL) {
drmMsg("%s: already mapped\n", __FUNCTION__);
drmMsg("%s: already mapped\n", __func__);
abort();
} else if (bo_fake->flags & (BM_NO_BACKING_STORE | BM_PINNED)) {
if (!bo_fake->block && !evict_and_alloc_block(bo)) {
DBG("%s: alloc failed\n", __FUNCTION__);
DBG("%s: alloc failed\n", __func__);
bufmgr_fake->fail = 1;
return 1;
} else {

7
tests/drmstat.c
View File

@ -48,11 +48,6 @@
#endif
#include "xf86drm.h"
/* Support gcc's __FUNCTION__ for people using other compilers */
#if !defined(__GNUC__) && !defined(__FUNCTION__)
# define __FUNCTION__ __func__ /* C99 */
#endif
int sigio_fd;
static double usec(struct timeval *end, struct timeval *start)
@ -87,7 +82,7 @@ static void process_sigio(char *device)
int fd;
if ((fd = open(device, 0)) < 0) {
drmError(-errno, __FUNCTION__);
drmError(-errno, __func__);
exit(1);
}