• Mike Frysinger's avatar
    Revert "include/uapi/linux/atm_zatm.h: include linux/time.h" · 7b5b74ef
    Mike Frysinger authored
    This reverts commit cf00713a ("include/uapi/linux/atm_zatm.h: include
    linux/time.h").
    
    This attempted to fix userspace breakage that no longer existed when
    the patch was merged.  Almost one year earlier, commit 70ba07b6
    
    
    ("atm: remove 'struct zatm_t_hist'") deleted the struct in question.
    
    After this patch was merged, we now have to deal with people being
    unable to include this header in conjunction with standard C library
    headers like stdlib.h (which linux-atm does).  Example breakage:
    x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I./../q2931 -I./../saal \
    	-I.  -DCPPFLAGS_TEST  -I../../src/include -O2 -march=native -pipe -g \
    	-frecord-gcc-switches -freport-bug -Wimplicit-function-declaration \
    	-Wnonnull -Wstrict-aliasing -Wparentheses -Warray-bounds \
    	-Wfree-nonheap-object -Wreturn-local-addr -fno-strict-aliasing -Wall \
    	-Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -c zntune.c
    In file included from /usr/include/linux/atm_zatm.h:17:0,
                     from zntune.c:17:
    /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 zntune.c:9:
    /usr/include/time.h:120:8: note: originally defined here
     struct timespec
            ^
    Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
    Acked-by: default avatarMikko Rapeli <mikko.rapeli@iki.fi>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    7b5b74ef
atm_zatm.h 1.44 KB