Skip to content

Commit 5289ce3

Browse files
committed
Renames log level enum values to not conflict with syslog
LOG_DEBUG conflicts with another enum definition in syslog.h, which causes compilation errors when included. This renames the enum values to be prefixed with LOGC instead of LOG to avoid this
1 parent 783d481 commit 5289ce3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/log.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
typedef void (*log_LockFn)(void *udata, int lock);
1717

18-
enum { LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR, LOG_FATAL };
19-
20-
#define log_trace(...) log_log(LOG_TRACE, __FILE__, __LINE__, __VA_ARGS__)
21-
#define log_debug(...) log_log(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
22-
#define log_info(...) log_log(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
23-
#define log_warn(...) log_log(LOG_WARN, __FILE__, __LINE__, __VA_ARGS__)
24-
#define log_error(...) log_log(LOG_ERROR, __FILE__, __LINE__, __VA_ARGS__)
25-
#define log_fatal(...) log_log(LOG_FATAL, __FILE__, __LINE__, __VA_ARGS__)
18+
enum { LOGC_TRACE, LOGC_DEBUG, LOGC_INFO, LOGC_WARN, LOGC_ERROR, LOGC_FATAL };
19+
20+
#define log_trace(...) log_log(LOGC_TRACE, __FILE__, __LINE__, __VA_ARGS__)
21+
#define log_debug(...) log_log(LOGC_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
22+
#define log_info(...) log_log(LOGC_INFO, __FILE__, __LINE__, __VA_ARGS__)
23+
#define log_warn(...) log_log(LOGC_WARN, __FILE__, __LINE__, __VA_ARGS__)
24+
#define log_error(...) log_log(LOGC_ERROR, __FILE__, __LINE__, __VA_ARGS__)
25+
#define log_fatal(...) log_log(LOGC_FATAL, __FILE__, __LINE__, __VA_ARGS__)
2626

2727
void log_set_udata(void *udata);
2828
void log_set_lock(log_LockFn fn);

0 commit comments

Comments
 (0)