From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 10 Oct 2016 19:16:09 +0000 (+0200)
Subject: Switch from I3__FILE__ to STRIPPED__FILE__
X-Git-Tag: 4.13~15^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=567897bec6378cd771c8a554b33c0f068786e2ca;p=i3%2Fi3

Switch from I3__FILE__ to STRIPPED__FILE__

…as we now use the m4/ax_extend_srcdir.m4 macro, which defines
STRIPPED__FILE__ (the macro is not i3-specific).
---

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;