From 0f42b87326dfcbc0ffb856d6544f4824d4f4e636 Mon Sep 17 00:00:00 2001 From: Tharre Date: Thu, 24 Apr 2014 23:04:24 +0200 Subject: Convert __FILENAME__ to _FILENAME so it follows standard conventions --- src/build.c | 2 +- src/dbg.h | 8 ++++---- src/util.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/build.c b/src/build.c index dc67b0f..ce02f1b 100644 --- a/src/build.c +++ b/src/build.c @@ -11,7 +11,7 @@ #include "build.h" #include "util.h" -#define __FILENAME__ "build.c" +#define _FILENAME "build.c" #include "dbg.h" /* TODO: more useful return codes? */ diff --git a/src/dbg.h b/src/dbg.h index 41bebb9..5573f8e 100644 --- a/src/dbg.h +++ b/src/dbg.h @@ -6,9 +6,9 @@ #include #include -// #define __BFILE__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) -#ifndef __FILENAME__ -#define __FILENAME__ __FILE__ + +#ifndef _FILENAME +#define _FILENAME __FILE__ #endif /* helper functions which help in replacing the GNU extension ##__VA_ARGS__ */ @@ -24,7 +24,7 @@ #define debug(...) log_err(__VA_ARGS__) #endif -#define log_err(...) LOG_HELPER(__FILENAME__, __LINE__, __VA_ARGS__) +#define log_err(...) LOG_HELPER(_FILENAME, __LINE__, __VA_ARGS__) #define fatal(...) \ {FATAL_HELPER(__VA_ARGS__, strerror(errno)); exit(EXIT_FAILURE);} #define fatal_(f,l,...) \ diff --git a/src/util.c b/src/util.c index a0e05f5..c4897ac 100644 --- a/src/util.c +++ b/src/util.c @@ -5,7 +5,7 @@ #include #include "util.h" -#define __FILENAME__ "util.c" +#define _FILENAME "util.c" #include "dbg.h" #include "../config.h" -- cgit v1.2.3-70-g09d2