X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Ferror.h;h=a061f6680e12e33b41f9db79053a3e4be874c458;hb=4ff750609549a99f6b318ce600c42c90d4f2e480;hp=6660cee6adec9f765d8802bacfe80db44e67f954;hpb=48a4000561343808724f7cb5fa8c131877489ccd;p=deliverable%2Flttng-tools.git diff --git a/src/common/error.h b/src/common/error.h index 6660cee6a..a061f6680 100644 --- a/src/common/error.h +++ b/src/common/error.h @@ -25,10 +25,6 @@ #include #include -#if defined(__cplusplus) -extern "C" { -#endif - /* Avoid conflict with Solaris */ #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; @@ -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 */