diff options
| author |   Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-03-31 11:10:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2020-03-31 11:10:00 +0000 |
| commit | 23c3bb7400839b664096ad5e16a2346386109bda (patch) | |
| tree | d1999acef9f91cd25db9b7c63fd2963cd7ba0e57 /lib/includes/hicn/util/log.h | |
| parent | d46e59824bd3fc67abe7bd725965aa454942d640 (diff) | |
| parent | 3718e549ee31ac764b327bbf3d6e51dd7e224b46 (diff) | |
Merge "[HICN-581] update hicn stack to support windows, again"
Diffstat (limited to 'lib/includes/hicn/util/log.h')
| -rw-r--r-- | lib/includes/hicn/util/log.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/includes/hicn/util/log.h b/lib/includes/hicn/util/log.h index 26d7d9418..6763d464f 100644 --- a/lib/includes/hicn/util/log.h +++ b/lib/includes/hicn/util/log.h @@ -46,6 +46,9 @@ extern log_conf_t log_conf; BLOCK #define FATAL(fmt, ...) (_log(LOG_FATAL, fmt, ##__VA_ARGS__ )) +#ifdef ERROR +#undef ERROR +#endif #define ERROR(fmt, ...) (_log(LOG_ERROR, fmt, ##__VA_ARGS__ )) #define WARN(fmt, ...) (_log(LOG_WARN, fmt, ##__VA_ARGS__ )) #define INFO(fmt, ...) (_log(LOG_INFO, fmt, ##__VA_ARGS__ )) |