From 8f366c820ac8381c76a6afbc5871cd57dec508ee Mon Sep 17 00:00:00 2001 From: Julius Pfrommer Date: Mon, 3 Dec 2018 08:06:24 +0100 Subject: [PATCH] Logging: Simplify the logging plugin includes --- include/ua_plugin_log.h | 3 --- plugins/ua_log_stdout.c | 13 ++++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/include/ua_plugin_log.h b/include/ua_plugin_log.h index 5ddae5fe2..115134e8b 100644 --- a/include/ua_plugin_log.h +++ b/include/ua_plugin_log.h @@ -11,9 +11,6 @@ #include #include "ua_config.h" -#include "ua_types.h" -#include "ua_types_generated_handling.h" -#include "base64.h" _UA_BEGIN_DECLS diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c index b62d439ab..4a9246117 100644 --- a/plugins/ua_log_stdout.c +++ b/plugins/ua_log_stdout.c @@ -7,8 +7,12 @@ #include #include "ua_log_stdout.h" -#include "ua_types_generated.h" -#include "ua_types_generated_handling.h" +#include "ua_types.h" + +#ifdef UA_ENABLE_MULTITHREADING +#include +static pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; +#endif /* ANSI escape sequences for color output taken from here: * https://stackoverflow.com/questions/3219393/stdlib-and-colored-output-in-c*/ @@ -39,11 +43,6 @@ const char *logLevelNames[6] = {"trace", "debug", const char *logCategoryNames[7] = {"network", "channel", "session", "server", "client", "userland", "securitypolicy"}; -#ifdef UA_ENABLE_MULTITHREADING -#include -static pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif - #ifdef __clang__ __attribute__((__format__(__printf__, 4 , 0))) #endif