Forráskód Böngészése

Logging: Simplify the logging plugin includes

Julius Pfrommer 5 éve
szülő
commit
8f366c820a
2 módosított fájl, 6 hozzáadás és 10 törlés
  1. 0 3
      include/ua_plugin_log.h
  2. 6 7
      plugins/ua_log_stdout.c

+ 0 - 3
include/ua_plugin_log.h

@@ -11,9 +11,6 @@
 
 #include <stdarg.h>
 #include "ua_config.h"
-#include "ua_types.h"
-#include "ua_types_generated_handling.h"
-#include "base64.h"
 
 _UA_BEGIN_DECLS
 

+ 6 - 7
plugins/ua_log_stdout.c

@@ -7,8 +7,12 @@
 
 #include <stdio.h>
 #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 <pthread.h>
+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 <pthread.h>
-static pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
 #ifdef __clang__
 __attribute__((__format__(__printf__, 4 , 0)))
 #endif