diff options
| author | anholt <anholt@FreeBSD.org> | 2002-05-31 23:19:50 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2002-05-31 23:19:50 +0000 |
| commit | b1848cc8d244b95193cdec9bd23e1bd837c4a03c (patch) | |
| tree | f8c216beb294e0702ffab9c769c9f9060eedf0e8 /sys/dev/drm/drm_os_freebsd.h | |
| parent | c83ce35c4a5b4f3347fe5e2337b74d6099d64c08 (diff) | |
| download | FreeBSD-src-b1848cc8d244b95193cdec9bd23e1bd837c4a03c.zip FreeBSD-src-b1848cc8d244b95193cdec9bd23e1bd837c4a03c.tar.gz | |
Warnings cleanup for gcc3. Also __FUNCTION__ -> __func__
Approved by: des
Diffstat (limited to 'sys/dev/drm/drm_os_freebsd.h')
| -rw-r--r-- | sys/dev/drm/drm_os_freebsd.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index c2bb845..7672f18 100644 --- a/sys/dev/drm/drm_os_freebsd.h +++ b/sys/dev/drm/drm_os_freebsd.h @@ -119,7 +119,7 @@ do { \ #define DRM_OS_READMEMORYBARRIER \ { \ int xchangeDummy; \ - DRM_DEBUG("%s\n", __FUNCTION__); \ + DRM_DEBUG("%s\n", __func__); \ __asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy)); \ __asm__ volatile(" push %%eax ; push %%ebx ; push %%ecx ; push %%edx ;" \ " movl $0,%%eax ; cpuid ; pop %%edx ; pop %%ecx ; pop %%ebx ;" \ @@ -242,18 +242,19 @@ find_first_zero_bit(volatile unsigned long *p, int max) /* Macros to make printf easier */ #define DRM_ERROR(fmt, arg...) \ - printf("error: " "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg) + printf("error: [" DRM_NAME ":%s] *ERROR* " fmt , \ + __func__, ##arg) #define DRM_MEM_ERROR(area, fmt, arg...) \ - printf("error: " "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \ - DRM(mem_stats)[area].name , ##arg) + printf("error: [" DRM_NAME ":%s:%s] *ERROR* " fmt , \ + __func__, DRM(mem_stats)[area].name , ##arg) #define DRM_INFO(fmt, arg...) printf("info: " "[" DRM_NAME "] " fmt , ##arg) #if DRM_DEBUG_CODE -#define DRM_DEBUG(fmt, arg...) \ - do { \ - if (DRM(flags) & DRM_FLAG_DEBUG) \ - printf("[" DRM_NAME ":" __FUNCTION__ "] " fmt , \ - ##arg); \ +#define DRM_DEBUG(fmt, arg...) \ + do { \ + if (DRM(flags) & DRM_FLAG_DEBUG) \ + printf("[" DRM_NAME ":%s] " fmt , \ + __func__, ##arg); \ } while (0) #else #define DRM_DEBUG(fmt, arg...) do { } while (0) |
