[acassen/keepalived] 510c6b: Work around conflict between kernel and libipset h...

  Branch: refs/heads/master
  Home:   https://github.com/acassen/keepalived
  Commit: 510c6b4719a3ee45b1af975b0bcfc5f6e4a4ed6e
      https://github.com/acassen/keepalived/commit/510c6b4719a3ee45b1af975b0bcfc5f6e4a4ed6e
  Author: Quentin Armitage <[email protected]>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived/include/global_data.h
    M keepalived/include/vrrp_ipset.h
    M keepalived/vrrp/vrrp_ipset.c
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M lib/config.h.in

  Log Message:
  -----------
  Work around conflict between kernel and libipset header files

ipset copies linux/netfilter/ipset/ip_set.h (and other) header
files, producing local copies that are installed as
libipset/linux_ip_set.h etc as part of the libipset development
package. Unfortunately although the kernel changes the include
guards when processing its source code, ipset does not, and so
the duplicated header files have different include guards.

This patch detects if the include guards don't match, and if so
if linux/netfilter/ipset/ip_set.h is included, it defines the
include guard used by libipset/linux_ip_set.h before the latter is
indirectly included.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 5a7f895bb795269f79e6353c6269dfbc0b782281
      https://github.com/acassen/keepalived/commit/5a7f895bb795269f79e6353c6269dfbc0b782281
  Author: pqarmitage <[email protected]>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived/include/global_data.h
    M keepalived/include/vrrp_ipset.h
    M keepalived/vrrp/vrrp_ipset.c
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M lib/config.h.in

  Log Message:
  -----------
  Merge pull request #567 from pqarmitage/fixes

Work around conflict between kernel and libipset header files


Compare: https://github.com/acassen/keepalived/compare/2a5e7f27264d...5a7f895bb795

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

_______________________________________________
Keepalived-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/keepalived-devel