From 567897bec6378cd771c8a554b33c0f068786e2ca Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 10 Oct 2016 21:16:09 +0200 Subject: [PATCH] Switch from I3__FILE__ to STRIPPED__FILE__ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit …as we now use the m4/ax_extend_srcdir.m4 macro, which defines STRIPPED__FILE__ (the macro is not i3-specific). --- include/libi3.h | 2 +- include/log.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libi3.h b/include/libi3.h index 5123ce01..0d9189f3 100644 --- a/include/libi3.h +++ b/include/libi3.h @@ -89,7 +89,7 @@ void errorlog(char *fmt, ...) #if !defined(DLOG) void debuglog(char *fmt, ...) __attribute__((format(printf, 1, 2))); -#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__) +#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, STRIPPED__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__) #endif /** diff --git a/include/log.h b/include/log.h index e7fc8acb..b683529c 100644 --- a/include/log.h +++ b/include/log.h @@ -27,7 +27,7 @@ is, delete the preceding comma */ #define LOG(fmt, ...) verboselog(fmt, ##__VA_ARGS__) #define ELOG(fmt, ...) errorlog("ERROR: " fmt, ##__VA_ARGS__) -#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__) +#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, STRIPPED__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__) extern char *errorfilename; extern char *shmlogname; -- 2.39.5