From 3c68731fe06c9b6158204ffcc4bfd49d1c1e83fd Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Wed, 16 Apr 2025 18:00:50 +0800 Subject: [PATCH] ensure __FILENAME__ is defined even if ENABLE_TRACING is off --- thermion_dart/native/include/Log.hpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/thermion_dart/native/include/Log.hpp b/thermion_dart/native/include/Log.hpp index 302c1b47..3ce5ce83 100644 --- a/thermion_dart/native/include/Log.hpp +++ b/thermion_dart/native/include/Log.hpp @@ -36,7 +36,15 @@ static void Log(const char *fmt, ...) { #define __FILENAME__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) #endif -#define ERROR(fmt, ...) Log("Error: %s:%d " fmt, __FILENAME__, __LINE__, ##__VA_ARGS__) +#ifdef __ANDROID__ + #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) +#elif defined __OBJC__ + #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) +#else + #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) +#endif + + #ifdef ENABLE_TRACING #ifdef __ANDROID__ #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) @@ -52,4 +60,6 @@ static void Log(const char *fmt, ...) { #define TRACE(fmt, ...) ((void)0) #endif +#define ERROR(fmt, ...) Log("Error: %s:%d " fmt, __FILENAME__, __LINE__, ##__VA_ARGS__) + #endif \ No newline at end of file