Quoting Stéphane Graber (stgra...@ubuntu.com):
> ushort appears to be a glibc specific type which doesn't exist in
> bionic, this commit simply replace all occurences by the equivalent
> unsigned short type.
>
> Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com>
> ---
> src/lxc/conf.h | 4 ++--
> src/lxc/network.c | 2 +-
> src/lxc/network.h | 2 +-
> src/lxc/nl.c | 2 +-
> src/lxc/nl.h | 2 +-
> src/lxc/utils.c | 2 +-
> src/lxc/utils.h | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/lxc/conf.h b/src/lxc/conf.h
> index b576893..fa3aada 100644
> --- a/src/lxc/conf.h
> +++ b/src/lxc/conf.h
> @@ -87,8 +87,8 @@ struct ifla_veth {
> struct ifla_vlan {
> uint flags;
> uint fmask;
> - ushort vid;
> - ushort pad;
> + unsigned short vid;
> + unsigned short pad;
> };
>
> struct ifla_macvlan {
> diff --git a/src/lxc/network.c b/src/lxc/network.c
> index f97e685..9a55a48 100644
> --- a/src/lxc/network.c
> +++ b/src/lxc/network.c
> @@ -413,7 +413,7 @@ out:
> }
>
> /* XXX: merge with lxc_macvlan_create */
> -int lxc_vlan_create(const char *master, const char *name, ushort vlanid)
> +int lxc_vlan_create(const char *master, const char *name, unsigned short
> vlanid)
> {
> struct nl_handler nlh;
> struct nlmsg *nlmsg = NULL, *answer = NULL;
> diff --git a/src/lxc/network.h b/src/lxc/network.h
> index 3f45f7f..ff2ea9e 100644
> --- a/src/lxc/network.h
> +++ b/src/lxc/network.h
> @@ -61,7 +61,7 @@ extern int lxc_netdev_set_mtu(const char *name, int mtu);
> */
> extern int lxc_veth_create(const char *name1, const char *name2);
> extern int lxc_macvlan_create(const char *master, const char *name, int
> mode);
> -extern int lxc_vlan_create(const char *master, const char *name, ushort vid);
> +extern int lxc_vlan_create(const char *master, const char *name, unsigned
> short vid);
>
> /*
> * Activate forwarding
> diff --git a/src/lxc/nl.c b/src/lxc/nl.c
> index 06ff401..125fafd 100644
> --- a/src/lxc/nl.c
> +++ b/src/lxc/nl.c
> @@ -79,7 +79,7 @@ extern int nla_put_u32(struct nlmsg *nlmsg, int attr, int
> value)
> return nla_put(nlmsg, attr, &value, sizeof(value));
> }
>
> -extern int nla_put_u16(struct nlmsg *nlmsg, int attr, ushort value)
> +extern int nla_put_u16(struct nlmsg *nlmsg, int attr, unsigned short value)
> {
> return nla_put(nlmsg, attr, &value, 2);
> }
> diff --git a/src/lxc/nl.h b/src/lxc/nl.h
> index 34aeb36..32c08b5 100644
> --- a/src/lxc/nl.h
> +++ b/src/lxc/nl.h
> @@ -169,7 +169,7 @@ int nla_put_u32(struct nlmsg *nlmsg, int attr, int value);
> *
> * Returns 0 on success, < 0 otherwise
> */
> -int nla_put_u16(struct nlmsg *nlmsg, int attr, ushort value);
> +int nla_put_u16(struct nlmsg *nlmsg, int attr, unsigned short value);
>
> /*
> * nla_put_attr: add an attribute name to a netlink
> diff --git a/src/lxc/utils.c b/src/lxc/utils.c
> index 52a463d..2a01f8f 100644
> --- a/src/lxc/utils.c
> +++ b/src/lxc/utils.c
> @@ -149,7 +149,7 @@ extern int lxc_setup_fs(void)
> }
>
> /* borrowed from iproute2 */
> -extern int get_u16(ushort *val, const char *arg, int base)
> +extern int get_u16(unsigned short *val, const char *arg, int base)
> {
> unsigned long res;
> char *ptr;
> diff --git a/src/lxc/utils.h b/src/lxc/utils.h
> index d47c983..cfb526e 100644
> --- a/src/lxc/utils.h
> +++ b/src/lxc/utils.h
> @@ -25,7 +25,7 @@
>
> extern int lxc_copy_file(const char *src, const char *dst);
> extern int lxc_setup_fs(void);
> -extern int get_u16(ushort *val, const char *arg, int base);
> +extern int get_u16(unsigned short *val, const char *arg, int base);
> extern int mkdir_p(const char *dir, mode_t mode);
>
> #endif
> --
> 1.8.0
>
>
> ------------------------------------------------------------------------------
> Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
> MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
> with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
> MVPs and experts. ON SALE this month only -- learn more at:
> http://p.sf.net/sfu/learnmore_122712
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
