X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=8bb0de15cfa70f0c621bae207932274903a65c70;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=8af989e0436fd910678eb994fa7ebef48c63dd0a;hpb=0c818c97b35a36971c326171d9aea5b0a432ced9;p=lttng-tools.git

diff --git a/src/common/error.h b/src/common/error.h
index 8af989e04..8bb0de15c 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -25,6 +25,10 @@
 #include <lttng/lttng-error.h>
 #include <common/compat/tid.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /* Avoid conflict with Solaris <sys/regset.h> */
 #if defined(ERR) && defined(__sun__)
 #undef ERR
@@ -43,7 +47,7 @@ struct log_time {
 	/* Format: 00:00:00.000000000 plus NULL byte. */
 	char str[19];
 };
-extern DECLARE_URCU_TLS(struct log_time, error_log_time);
+extern LTTNG_EXPORT  DECLARE_URCU_TLS(struct log_time, error_log_time);
 extern DECLARE_URCU_TLS(const char *, logger_thread_name);
 
 extern int lttng_opt_quiet;
@@ -221,7 +225,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
 			DBG3(fmt, ## args);	\
 			break;			\
 		default:			\
-			assert(0);		\
+			abort();		\
 		}				\
 	} while(0);
 
@@ -262,7 +266,10 @@ const char *error_get_str(int32_t code);
 const char *log_add_time(void);
 
 /* Name must be a statically-allocated string. */
-LTTNG_HIDDEN
 void logger_set_thread_name(const char *name, bool set_pthread_name);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* _ERROR_H */