]>
Commit | Line | Data |
---|---|---|
def22086 AF |
1 | Fix build failure against linux-5.2+: |
2 | https://www.spinics.net/lists/linux-sh/msg53430.html | |
3 | ||
4 | --- a/src/maint/atmdump.c | |
5 | +++ b/src/maint/atmdump.c | |
6 | @@ -17,6 +17,16 @@ | |
7 | #include <netinet/in.h> /* for htonl and ntohl */ | |
8 | #include <atm.h> | |
9 | ||
10 | +#ifndef SIOCGSTAMP | |
11 | +/* linux-5.2+ added support for 64-bit time_t into ioctls | |
12 | + that support 'struct timeval' and removed 'SIOCGSTAMP' | |
13 | + define. | |
14 | + | |
15 | + Include 'SIOCGSTAMP' wrapper via linux/sockios.h | |
16 | + if does not exist. | |
17 | + */ | |
18 | +# include <linux/sockios.h> | |
19 | +#endif | |
20 | ||
21 | static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE", | |
22 | "Data SDU 1, CE","Segment OAM F5","End-to-end OAM F5","Reserved (RM)", | |
23 | --- a/src/maint/saaldump.c | |
24 | +++ b/src/maint/saaldump.c | |
25 | @@ -24,6 +24,16 @@ | |
26 | ||
27 | #define MAX_ITEM 2048 /* longest string emitted by q.dump */ | |
28 | ||
29 | +#ifndef SIOCGSTAMP | |
30 | +/* linux-5.2+ added support for 64-bit time_t into ioctls | |
31 | + that support 'struct timeval' and removed 'SIOCGSTAMP' | |
32 | + define. | |
33 | + | |
34 | + Include 'SIOCGSTAMP' wrapper via linux/sockios.h | |
35 | + if does not exist. | |
36 | + */ | |
37 | +# include <linux/sockios.h> | |
38 | +#endif | |
39 | ||
40 | static int interval = 0; /* display absolute time by default */ | |
41 | static int quiet = 0; /* decode Q.2931 messages by default */ |