Mikko Rapeli 4a91cb61bb uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h ... glibc's net/if.h contains copies of definitions from linux/if.h and these conflict and cause build failures if both files are included by application source code. Changes in uapi headers, which fixed header file dependencies to include linux/if.h when it was needed, e.g. commit 1ffad83d, made the net/if.h and linux/if.h incompatibilities visible as build failures for userspace applications like iproute2 and xtables-addons. This patch fixes compile errors when glibc net/if.h is included before linux/if.h: ./linux/if.h:99:21: error: redeclaration of enumerator ‘IFF_NOARP’ ./linux/if.h:98:23: error: redeclaration of enumerator ‘IFF_RUNNING’ ./linux/if.h:97:26: error: redeclaration of enumerator ‘IFF_NOTRAILERS’ ./linux/if.h:96:27: error: redeclaration of enumerator ‘IFF_POINTOPOINT’ ./linux/if.h:95:24: error: redeclaration of enumerator ‘IFF_LOOPBACK’ ./linux/if.h:94:21: error: redeclaration of enumerator ‘IFF_DEBUG’ ./linux/if.h:93:25: error: redeclaration of enumerator ‘IFF_BROADCAST’ ./linux/if.h:92:19: error: redeclaration of enumerator ‘IFF_UP’ ./linux/if.h:252:8: error: redefinition of ‘struct ifconf’ ./linux/if.h:203:8: error: redefinition of ‘struct ifreq’ ./linux/if.h:169:8: error: redefinition of ‘struct ifmap’ ./linux/if.h:107:23: error: redeclaration of enumerator ‘IFF_DYNAMIC’ ./linux/if.h:106:25: error: redeclaration of enumerator ‘IFF_AUTOMEDIA’ ./linux/if.h:105:23: error: redeclaration of enumerator ‘IFF_PORTSEL’ ./linux/if.h:104:25: error: redeclaration of enumerator ‘IFF_MULTICAST’ ./linux/if.h:103:21: error: redeclaration of enumerator ‘IFF_SLAVE’ ./linux/if.h:102:22: error: redeclaration of enumerator ‘IFF_MASTER’ ./linux/if.h:101:24: error: redeclaration of enumerator ‘IFF_ALLMULTI’ ./linux/if.h💯23: error: redeclaration of enumerator ‘IFF_PROMISC’ The cases where linux/if.h is included before net/if.h need a similar fix in the glibc side, or the order of include files can be changed userspace code as a workaround. This change was tested in x86 userspace on Debian unstable with scripts/headers_compile_test.sh: $ make headers_install && \ cd usr/include && ../../scripts/headers_compile_test.sh -l -k ... cc -Wall -c -nostdinc -I /usr/lib/gcc/i586-linux-gnu/5/include -I /usr/lib/gcc/i586-linux-gnu/5/include-fixed -I . -I /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.2uX2zH -I /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.2uX2zH/i586-linux-gnu -o /dev/null ./linux/if.h_libc_before_kernel.h PASSED libc before kernel test: ./linux/if.h Reported-by: Jan Engelhardt <jengelh@inai.de> Reported-by: Josh Boyer <jwboyer@fedoraproject.org> Reported-by: Stephen Hemminger <shemming@brocade.com> Reported-by: Waldemar Brodkorb <mail@waldemar-brodkorb.de> Cc: Gabriel Laskar <gabriel@lse.epita.fr> Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-09 21:29:31 -04:00
..
acpi	device property: Avoid potential dereferences of invalid pointers	2016-04-27 23:40:02 +02:00
asm-generic	asm-generic/futex: Re-enable preemption in futex_atomic_cmpxchg_inatomic()	2016-04-21 11:06:09 +02:00
clocksource
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-03-17 11:33:45 -07:00
drm	drm: Loongson-3 doesn't fully support wc memory	2016-04-22 10:24:11 +10:00
dt-bindings	The clk changes for this release cycle are mostly dominated by	2016-03-23 06:06:45 -07:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 12:11:37 -07:00
math-emu
media	[media] media: vb2: Fix regression on poll() for RW mode	2016-04-25 10:21:23 -03:00
memory
misc
net	udp_tunnel: Remove redundant udp_tunnel_gro_complete().	2016-05-06 18:25:26 -04:00
pcmcia
ras
rdma	IB/security: Restrict use of the write() interface	2016-04-28 12:03:16 -04:00
rxrpc
scsi	Merge branch 'fixes-base' into fixes	2016-04-05 06:56:47 -04:00
soc	IOMMU Updates for Linux v4.6	2016-03-22 11:57:43 -07:00
sound	ALSA: hda - Update BCLK also at hotplug for i915 HSW/BDW	2016-04-26 10:11:11 +02:00
target	target: add a new add_wwn_groups fabrics method	2016-03-30 20:06:44 -07:00
trace	Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2016-04-09 10:41:34 -07:00
uapi	uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h	2016-05-09 21:29:31 -04:00
video	gpu: ipu-v3: ipu-dmfc: Rename ipu_dmfc_init_channel to ipu_dmfc_config_wait4eot	2016-03-31 11:24:33 +02:00
xen	xen: Fix page <-> pfn conversion on 32 bit systems	2016-04-06 11:18:17 +01:00
Kbuild