On 15 October 2016 at 15:09, Mikko Rapeli <mikko.rap...@iki.fi> wrote: > On Sat, Oct 15, 2016 at 01:05:10PM +0100, Pascal Terjan wrote: >> It is no longer possible to include <linux/atm_zatm.h> + userspace >> headers using time, for example <stdlib.h>, this broke for example >> the build of linux-atm. >> >> Reproducer: >> >> $ cat test.c >> #include <linux/atm_zatm.h> >> #include <stdlib.h> > > If possible, please reverse the order of includes to first include glibc > headers and then Linux kernel uapi ones.
That was what I tried first but this didn't help: In file included from /usr/include/linux/atm_zatm.h:17:0, from test.c:2: /usr/include/linux/time.h:9:8: error: redefinition of 'struct timespec' struct timespec { ^ In file included from /usr/include/sys/select.h:43:0, from /usr/include/sys/types.h:219, from /usr/include/stdlib.h:314, from test.c:1: /usr/include/time.h:120:8: note: originally defined here struct timespec ^ In file included from /usr/include/linux/atm_zatm.h:17:0, from test.c:2: /usr/include/linux/time.h:15:8: error: redefinition of 'struct timeval' struct timeval { ^ In file included from /usr/include/sys/select.h:45:0, from /usr/include/sys/types.h:219, from /usr/include/stdlib.h:314, from test.c:1: /usr/include/bits/time.h:30:8: note: originally defined here struct timeval ^ > Kernel uapi headers did not declare their header file dependencies correctly > and I've been fixing them. I have also tried to fix compatibility issues > with glibc headers, but unfortunately they only work when glibc headers > are included before kernel headers. Userspace which has been relying on > the magic include order for various uapi headers is now unfortunately > affected. Sorry about that. In this case no order works, it seems the kernel doesn't handle it in time.h unlike many other headers