Merged!

Upstream and backported in stable-2.4

On 06 Feb (14:13:56), Jérémie Galarneau wrote:
> This makes it possible to include health.h in a C++ program.
> 
> Signed-off-by: Jérémie Galarneau <[email protected]>
> ---
>  include/lttng/health.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/include/lttng/health.h b/include/lttng/health.h
> index 9960928..9a7a7fc 100644
> --- a/include/lttng/health.h
> +++ b/include/lttng/health.h
> @@ -19,6 +19,10 @@
>   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>   */
>  
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
>  struct lttng_health;
>  struct lttng_health_thread;
>  
> @@ -124,4 +128,8 @@ int lttng_health_thread_state(const struct 
> lttng_health_thread *thread);
>   */
>  const char *lttng_health_thread_name(const struct lttng_health_thread 
> *thread);
>  
> +#ifdef __cplusplus
> +}
> +#endif
> +
>  #endif /* LTTNG_HEALTH_H */
> -- 
> 1.8.5.2
> 
> 
> _______________________________________________
> lttng-dev mailing list
> [email protected]
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Attachment: signature.asc
Description: Digital signature

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Reply via email to