[lxc-devel] [lxc/lxc] 07d10e: Fix redefinition of struct in6_addr

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 07d10e71d514733e2219794d07b4dce913f48aea
      https://github.com/lxc/lxc/commit/07d10e71d514733e2219794d07b4dce913f48aea
  Author: Jörg Krause <joerg.krause at embedded.rocks>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  Fix redefinition of struct in6_addr

struct in6_addr is both defined in the C library header <netinet/in.h>
and the Linux kernel header <linux/in6.h>.

lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The
later one includes <linux/in6.h>.

This breaks build with the musl libc:
  error: redefinition of ‘struct in6_addr’

As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it
is safe to remove this header.

Signed-off-by: Jörg Krause <joerg.krause at embedded.rocks>


  Commit: 95ca286dbd270fef6d1ebd02ec73c4d54e2ff3fb
      https://github.com/lxc/lxc/commit/95ca286dbd270fef6d1ebd02ec73c4d54e2ff3fb
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  Merge pull request #1029 from joerg-krause/master

Fix redefinition of struct in6_addr


Compare: https://github.com/lxc/lxc/compare/7679fc22f62d...95ca286dbd27