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

diff --git a/src/common/error.h b/src/common/error.h
index 6660cee6a..bcbb51b16 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -25,10 +25,6 @@
 #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
@@ -47,7 +43,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;
@@ -112,7 +108,7 @@ static inline bool __lttng_print_check_opt(enum lttng_error_level type)
 	return true;
 }
 
-void lttng_abort_on_error(void);
+C_LINKAGE void lttng_abort_on_error(void);
 
 static inline void __lttng_print_check_abort(enum lttng_error_level type)
 {
@@ -268,8 +264,4 @@ const char *log_add_time(void);
 /* Name must be a statically-allocated string. */
 void logger_set_thread_name(const char *name, bool set_pthread_name);
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif /* _ERROR_H */