X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=8bb0de15cfa70f0c621bae207932274903a65c70;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=daef71fdbc90646be59ebc781131a59688ad6c0c;hpb=a0377dfefe40662ba7d68617bce6ff467114136c;p=lttng-tools.git diff --git a/src/common/error.h b/src/common/error.h index daef71fdb..8bb0de15c 100644 --- a/src/common/error.h +++ b/src/common/error.h @@ -25,6 +25,10 @@ #include #include +#if defined(__cplusplus) +extern "C" { +#endif + /* Avoid conflict with Solaris */ #if defined(ERR) && defined(__sun__) #undef ERR @@ -43,8 +47,8 @@ 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_HIDDEN DECLARE_URCU_TLS(const char *, logger_thread_name); +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; extern int lttng_opt_verbose; @@ -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 */