From 87beacc99f62fc342a5380a3e12449d530bd0aa6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 20 Dec 2011 16:27:40 +0100 Subject: [PATCH] libkmod: use C99 __func__ over GNU-specific __FUNCTION__ --- libkmod/libkmod-elf.c | 2 +- libkmod/libkmod-private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c index 0eeb816..bc99ddc 100644 --- a/libkmod/libkmod-elf.c +++ b/libkmod/libkmod-elf.c @@ -64,7 +64,7 @@ struct kmod_elf { #if defined(ENABLE_LOGGING) && defined(ENABLE_ELFDBG) #define ELFDBG(elf, ...) \ - _elf_dbg(elf, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__); + _elf_dbg(elf, __FILE__, __LINE__, __func__, __VA_ARGS__); static inline void _elf_dbg(const struct kmod_elf *elf, const char *fname, unsigned line, const char *func, const char *fmt, ...) { diff --git a/libkmod/libkmod-private.h b/libkmod/libkmod-private.h index 8337172..4b0d84f 100644 --- a/libkmod/libkmod-private.h +++ b/libkmod/libkmod-private.h @@ -15,7 +15,7 @@ static __always_inline __printf_format(2, 3) void #define kmod_log_cond(ctx, prio, arg...) \ do { \ if (kmod_get_log_priority(ctx) >= prio) \ - kmod_log(ctx, prio, __FILE__, __LINE__, __FUNCTION__, ## arg);\ + kmod_log(ctx, prio, __FILE__, __LINE__, __func__, ## arg);\ } while (0) #ifdef ENABLE_LOGGING -- 2.7.4