diff options
| author | Petr Vorel <pvorel@suse.cz> | 2020-05-06 13:03:29 +0200 |
|---|---|---|
| committer | Petr Vorel <pvorel@suse.cz> | 2020-05-06 16:42:58 +0200 |
| commit | ef12b90de2e0814f4663ee79ca0970636c5392da (patch) | |
| tree | 209de16b6385775fa6aec2471daa32af988fc38d /testcases | |
| parent | 0f66eee021ee72d108bf7529c72a86d8729fcc96 (diff) | |
pty04: Fix build for kernel headers < v4.2-rc1
Acked-by: Cyril Hrubis <chrubis@suse.cz>
Acked-by: Jan Stancek <jstancek@redhat.com>
Suggested-by: Richard Palethorpe <rpalethorpe@suse.com>
Suggested-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Diffstat (limited to 'testcases')
| -rw-r--r-- | testcases/kernel/pty/pty04.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/testcases/kernel/pty/pty04.c b/testcases/kernel/pty/pty04.c index eaf172504..239d2a870 100644 --- a/testcases/kernel/pty/pty04.c +++ b/testcases/kernel/pty/pty04.c @@ -34,9 +34,10 @@ */ #define _GNU_SOURCE +#include "config.h" #include "tst_test.h" #include "tst_buffers.h" -#include "config.h" +#include "lapi/tty.h" #if defined(HAVE_LINUX_IF_PACKET_H) && defined(HAVE_LINUX_IF_ETHER_H) @@ -44,11 +45,14 @@ #include <linux/if_ether.h> #include <linux/tty.h> -#ifdef HAVE_LINUX_CAN_H -# include <linux/can.h> -#else -# define CAN_MTU 16 -# define CAN_MAX_DLEN 8 +/* + * define instead of including <linux/can.h> to support kernel headers + * before change from v4.2-rc1 + * a2f11835994e ("can.h: make padding given by gcc explicit"). + */ + +#define CAN_MTU 16 +#define CAN_MAX_DLEN 8 typedef uint32_t canid_t; @@ -60,7 +64,6 @@ struct can_frame { uint32_t __res1; uint32_t data[CAN_MAX_DLEN] __attribute__((aligned(8))); }; -#endif #include <stddef.h> #include <stdlib.h> |