| From f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Mon Sep 17 00:00:00 2001 |
| From: Bastien Nocera <hadess@hadess.net> |
| Date: Fri, 7 Jun 2019 09:51:33 +0200 |
| Subject: [PATCH] tools: Fix build after y2038 changes in glibc |
| |
| The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name |
| to fix the build. |
| |
| Upstream-Status: backport commit f36f71f60b1e68c0f12e615b9b128d089ec3dd19 |
| |
| Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> |
| |
| --- |
| tools/l2test.c | 6 +++++- |
| tools/rctest.c | 6 +++++- |
| 2 files changed, 10 insertions(+), 2 deletions(-) |
| |
| diff --git a/tools/l2test.c b/tools/l2test.c |
| index e755ac881..e787c2ce2 100644 |
| --- a/tools/l2test.c |
| +++ b/tools/l2test.c |
| @@ -55,6 +55,10 @@ |
| #define BREDR_DEFAULT_PSM 0x1011 |
| #define LE_DEFAULT_PSM 0x0080 |
| |
| +#ifndef SIOCGSTAMP_OLD |
| +#define SIOCGSTAMP_OLD SIOCGSTAMP |
| +#endif |
| + |
| /* Test modes */ |
| enum { |
| SEND, |
| @@ -907,7 +911,7 @@ static void recv_mode(int sk) |
| if (timestamp) { |
| struct timeval tv; |
| |
| - if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { |
| + if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { |
| timestamp = 0; |
| memset(ts, 0, sizeof(ts)); |
| } else { |
| diff --git a/tools/rctest.c b/tools/rctest.c |
| index 94490f462..bc8ed875d 100644 |
| --- a/tools/rctest.c |
| +++ b/tools/rctest.c |
| @@ -50,6 +50,10 @@ |
| |
| #include "src/shared/util.h" |
| |
| +#ifndef SIOCGSTAMP_OLD |
| +#define SIOCGSTAMP_OLD SIOCGSTAMP |
| +#endif |
| + |
| /* Test modes */ |
| enum { |
| SEND, |
| @@ -505,7 +509,7 @@ static void recv_mode(int sk) |
| if (timestamp) { |
| struct timeval tv; |
| |
| - if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { |
| + if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { |
| timestamp = 0; |
| memset(ts, 0, sizeof(ts)); |
| } else { |
| -- |
| 2.19.1 |
| |