diff --git a/CMakeLists.txt b/CMakeLists.txt index e60b6cb..ea96db6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 7) set(CTR_VERSION_PATCH 1) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") -# Define __FILENAME__ consistently across Operating Systems -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'") -else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") -endif() +# Define __CTR_FILENAME__ +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CTR_FILENAME__=__FILE__") # Configuration options option(CTR_DEV "Enable development mode" No) diff --git a/include/ctraces/ctr_log.h b/include/ctraces/ctr_log.h index c4aae2a..392a93c 100644 --- a/include/ctraces/ctr_log.h +++ b/include/ctraces/ctr_log.h @@ -38,27 +38,27 @@ void ctr_log_print(void *ctx, int level, const char *file, int line, int ctr_errno_print(int errnum, const char *file, int line); #define ctr_log_error(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_ERROR, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_ERROR, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_warn(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_WARN, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_WARN, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_info(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_INFO, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_INFO, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_debug(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_DEBUG, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_DEBUG, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_trace(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_TRACE, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_TRACE, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) -#ifdef __FILENAME__ -#define ctr_errno() ctr_errno_print(errno, __FILENAME__, __LINE__) +#ifdef __CTR_FILENAME__ +#define ctr_errno() ctr_errno_print(errno, __CTR_FILENAME__, __LINE__) #else #define ctr_errno() ctr_errno_print(errno, __FILE__, __LINE__) #endif