From fde10a899639ec42e9e883e64b503c7b8bff123d Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 7 Jun 2019 09:51:33 +0200 Subject: [PATCH 02/19] tools: Fix build after y2038 changes in glibc The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name to fix the build. [Retrieved from: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/tools/?id=f36f71f60b1e68c0f12e615b9b128d089ec3dd19] Signed-off-by: Fabrice Fontaine --- 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 1819423..400ac4a 100644 --- a/tools/l2test.c +++ b/tools/l2test.c @@ -54,6 +54,10 @@ #define BREDR_DEFAULT_PSM 0x1011 #define LE_DEFAULT_PSM 0x0080 +#ifndef SIOCGSTAMP_OLD +#define SIOCGSTAMP_OLD SIOCGSTAMP +#endif + /* Test modes */ enum { SEND, @@ -906,7 +910,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 6d84e07..6a2bd55 100644 --- a/tools/rctest.c +++ b/tools/rctest.c @@ -49,6 +49,10 @@ #include "src/shared/util.h" +#ifndef SIOCGSTAMP_OLD +#define SIOCGSTAMP_OLD SIOCGSTAMP +#endif + /* Test modes */ enum { SEND, @@ -504,7 +508,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.20.1