X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=6660cee6adec9f765d8802bacfe80db44e67f954;hb=48a4000561343808724f7cb5fa8c131877489ccd;hp=b43ec661b76a5ee742495c438b0232007768491f;hpb=2fdab47db9cf2b8413516fc3f3491f3dcaff2931;p=lttng-tools.git

diff --git a/src/common/error.h b/src/common/error.h
index b43ec661b..6660cee6a 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
@@ -44,7 +48,7 @@ struct log_time {
 	char str[19];
 };
 extern DECLARE_URCU_TLS(struct log_time, error_log_time);
-extern LTTNG_HIDDEN DECLARE_URCU_TLS(const char *, logger_thread_name);
+extern DECLARE_URCU_TLS(const char *, logger_thread_name);
 
 extern int lttng_opt_quiet;
 extern int lttng_opt_verbose;
@@ -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 */