tap-driver.sh: flush stdout after each test result

[babeltrace.git] / logging / log.c

diff --git a/logging/log.c b/logging/log.c
index 13fcab8e843218dca263316450fb41319146644f..a7946ca6c64c424db1d5a2fe2abb4fb8569487fd 100644 (file)
--- a/logging/log.c
+++ b/logging/log.c
@@ -4,9 +4,10 @@
  * See LICENSE.
  */
 
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/common-internal.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/common-internal.h>
 #include <pthread.h>
+#include <assert.h>
 
 #ifdef __CYGWIN__
 extern unsigned long pthread_getsequence_np(pthread_t *);
@@ -288,7 +289,7 @@ extern unsigned long pthread_getsequence_np(pthread_t *);
                #undef __STRICT_ANSI__
        #endif
 #endif
-#include <assert.h>
+#include <babeltrace2/assert-internal.h>
 #include <ctype.h>
 #include <string.h>
 #include <time.h>
@@ -299,8 +300,8 @@ extern unsigned long pthread_getsequence_np(pthread_t *);
 
 #define BT_LOG_OUTPUT_LEVEL dummy
 
-#include <babeltrace/logging-internal.h>
-#include <babeltrace/logging.h>
+#include <babeltrace2/logging-internal.h>
+#include <babeltrace2/logging.h>
 
 #if defined(_WIN32) || defined(_WIN64)
        #include <windows.h>
@@ -538,7 +539,7 @@ STATIC_ASSERT(eol_sz_greater_than_zero, 0 < BT_LOG_EOL_SZ);
 STATIC_ASSERT(eol_sz_less_than_buf_sz, BT_LOG_EOL_SZ < BT_LOG_BUF_SZ);
 static const char c_hex[] = "0123456789abcdef";
 
-static char __thread logging_buf[4 * 4096];
+static __thread char logging_buf[4 * 4096];
 
 static INSTRUMENTED_CONST unsigned g_buf_sz = BT_LOG_BUF_SZ - BT_LOG_EOL_SZ;
 static INSTRUMENTED_CONST time_cb g_time_cb = time_callback;