[lxc-devel] [PATCH 1/3] Allow use of public API from C++

[Stéphane Graber]

On Tue, Dec 24, 2013 at 09:08:12PM +0400, Andrey Mazo wrote:
> Signed-off-by: Andrey Mazo <mazo at telum.ru>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  src/lxc/attach_options.h | 8 ++++++++
>  src/lxc/lxccontainer.h   | 8 ++++++++
>  2 files changed, 16 insertions(+)
> 
> diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
> index 70a39a9..c7295fb 100644
> --- a/src/lxc/attach_options.h
> +++ b/src/lxc/attach_options.h
> @@ -27,6 +27,10 @@
>  
>  #include <sys/types.h>
>  
> +#ifdef  __cplusplus
> +extern "C" {
> +#endif
> +
>  /*!
>   * LXC environment policy.
>   */
> @@ -168,4 +172,8 @@ extern int lxc_attach_run_command(void* payload);
>   */
>  extern int lxc_attach_run_shell(void* payload);
>  
> +#ifdef  __cplusplus
> +}
> +#endif
> +
>  #endif
> diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
> index 797ad91..7d1839e 100644
> --- a/src/lxc/lxccontainer.h
> +++ b/src/lxc/lxccontainer.h
> @@ -28,6 +28,10 @@
>  #include <stdbool.h>
>  #include <stdlib.h>
>  
> +#ifdef  __cplusplus
> +extern "C" {
> +#endif
> +
>  #define LXC_CLONE_KEEPNAME        (1 << 0) /*!< Do not edit the rootfs to change the hostname */
>  #define LXC_CLONE_KEEPMACADDR     (1 << 1) /*!< Do not change the MAC address on network interfaces */
>  #define LXC_CLONE_SNAPSHOT        (1 << 2) /*!< Snapshot the original filesystem(s) */
> @@ -871,4 +875,8 @@ int list_active_containers(const char *lxcpath, char ***names, struct lxc_contai
>   */
>  int list_all_containers(const char *lxcpath, char ***names, struct lxc_container ***cret);
>  
> +#ifdef  __cplusplus
> +}
> +#endif
> +
>  #endif
> -- 
> 1.8.4.5
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20131225/90090dd1/attachment.pgp>