[lttng-dev] [PATCH lttng-tools] Add extern C to the health-check header

[lttng-dev] [PATCH lttng-tools] Add extern C to the health-check header

[Jérémie Galarneau]

This makes it possible to include health.h in a C++ program.

Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 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] [PATCH lttng-tools] Add extern C to the health-check header

[Mathieu Desnoyers]

Acked-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>

Thanks,

Mathieu

----- Original Message -----
> From: "J?r?mie Galarneau" <jeremie.galarneau@efficios.com>
> To: lttng-dev at lists.lttng.org
> Sent: Thursday, February 6, 2014 2:13:56 PM
> Subject: [lttng-dev] [PATCH lttng-tools] Add extern C to the health-check	header
> 
> This makes it possible to include health.h in a C++ program.
> 
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  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
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> 

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

[lttng-dev] [PATCH lttng-tools] Add extern C to the health-check header

[David Goulet]

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 <jeremie.galarneau at efficios.com>
> ---
>  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
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20140207/31d07ac2/attachment.pgp>