Skip to content

Commit

Permalink
Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"
Browse files Browse the repository at this point in the history
This reverts commit cf00713 ("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 70ba07b
("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: Mike Frysinger <[email protected]>
Acked-by: Mikko Rapeli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
vapier authored and davem330 committed Nov 13, 2016
1 parent ac6e780 commit 7b5b74e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion include/uapi/linux/atm_zatm.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#include <linux/atmapi.h>
#include <linux/atmioc.h>
#include <linux/time.h>

#define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
/* get pool statistics */
Expand Down

0 comments on commit 7b5b74e

Please sign in to comment.