log : try to fix Windows build
This commit is contained in:
parent
891ac40668
commit
5c978f48a4
1 changed files with 20 additions and 20 deletions
40
common/log.h
40
common/log.h
|
@ -226,13 +226,13 @@ enum LogTriState
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
/**/#define _LOG(str, ...) \
|
/**/#define _LOG(str, ...) \
|
||||||
{ \
|
{ \
|
||||||
if (LOG_TARGET != nullptr) \
|
if (LOG_TARGET != nullptr) \
|
||||||
{ \
|
{ \
|
||||||
fprintf(LOG_TARGET, LOG_TIMESTAMP_FMT LOG_FLF_FMT str "%s" LOG_TIMESTAMP_VAL LOG_FLF_VAL "", __VA_ARGS__); \
|
fprintf(LOG_TARGET, LOG_TIMESTAMP_FMT LOG_FLF_FMT str "%s" LOG_TIMESTAMP_VAL LOG_FLF_VAL "", ##__VA_ARGS__); \
|
||||||
fflush(LOG_TARGET); \
|
fflush(LOG_TARGET); \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -254,18 +254,18 @@ enum LogTriState
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
/**/#define _LOG_TEE(str, ...) \
|
/**/#define _LOG_TEE(str, ...) \
|
||||||
{ \
|
{ \
|
||||||
if (LOG_TARGET != nullptr) \
|
if (LOG_TARGET != nullptr) \
|
||||||
{ \
|
{ \
|
||||||
fprintf(LOG_TARGET, LOG_TIMESTAMP_FMT LOG_FLF_FMT str "%s" LOG_TIMESTAMP_VAL LOG_FLF_VAL "", __VA_ARGS__); \
|
fprintf(LOG_TARGET, LOG_TIMESTAMP_FMT LOG_FLF_FMT str "%s" LOG_TIMESTAMP_VAL LOG_FLF_VAL "", ##__VA_ARGS__); \
|
||||||
fflush(LOG_TARGET); \
|
fflush(LOG_TARGET); \
|
||||||
} \
|
} \
|
||||||
if (LOG_TARGET != nullptr && LOG_TARGET != stdout && LOG_TARGET != stderr && LOG_TEE_TARGET != nullptr) \
|
if (LOG_TARGET != nullptr && LOG_TARGET != stdout && LOG_TARGET != stderr && LOG_TEE_TARGET != nullptr) \
|
||||||
{ \
|
{ \
|
||||||
fprintf(LOG_TEE_TARGET, LOG_TEE_TIMESTAMP_FMT LOG_TEE_FLF_FMT str "%s" LOG_TEE_TIMESTAMP_VAL LOG_TEE_FLF_VAL "", __VA_ARGS__); \
|
fprintf(LOG_TEE_TARGET, LOG_TEE_TIMESTAMP_FMT LOG_TEE_FLF_FMT str "%s" LOG_TEE_TIMESTAMP_VAL LOG_TEE_FLF_VAL "", ##__VA_ARGS__); \
|
||||||
fflush(LOG_TEE_TARGET); \
|
fflush(LOG_TEE_TARGET); \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -584,7 +584,7 @@ inline std::string _log_var_to_string(const std::vector<int> & var)
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define LOG_TOKENS_TOSTR_PRETTY(tokens, ctx) \
|
#define LOG_TOKENS_TOSTR_PRETTY(ctx, tokens) \
|
||||||
[&tokens, &ctx]() \
|
[&tokens, &ctx]() \
|
||||||
{ \
|
{ \
|
||||||
std::string buf("[ "); \
|
std::string buf("[ "); \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue