On Mon, May 09, 2016 at 09:59:22AM -0400, Josh Boyer wrote: > On Sun, Apr 24, 2016 at 11:45 AM, Mikko Rapeli <mikko.rapeli@xxxxxx> wrote: > > 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’ [...] > > > > 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@xxxxxxx> > > Reported-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> > > Reported-by: Stephen Hemminger <shemming@xxxxxxxxxxx> > > Reported-by: Waldemar Brodkorb <mail@xxxxxxxxxxxxxxxxxxxx> > > Cc: Gabriel Laskar <gabriel@xxxxxxxxxxxx> > > Signed-off-by: Mikko Rapeli <mikko.rapeli@xxxxxx> > > Bump. Did this get lost in a queue somewhere? It seems linux-netdev was not Cc'ed. I cannot find this in David's patchwork [1]. @Mikko: Could you resubmit including netdev@xxxxxxxxxxxxxxx? Thanks. [1] http://patchwork.ozlabs.org/project/netdev/list/. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
