tools: Fix build after y2038 changes in glibc
RFC 1/1 tools: Fix build after y2038 changes in glibc
The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name to fix the build.
--- tools/l2test.c | 6 +++++- tools/rctest.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
tools/l2test.c +5 -1
@@ -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 {
tools/rctest.c +5 -1
@@ -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 {
Signature · 1 line
2.21.0
Quoted 2 lines · Bastien Nocera
The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name to fix the build.
Without this patch (or a port to the new 64-bit timestamps) you'd get this error on newer glibcs:
BUILDSTDERR: tools/rctest.c: In function 'recv_mode':
BUILDSTDERR: tools/rctest.c:507:19: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGARP'?
BUILDSTDERR: 507 | if (ioctl(sk, SIOCGSTAMP, &tv) < 0) {
BUILDSTDERR: | ^~~~~~~~~~
BUILDSTDERR: | SIOCGARP
BUILDSTDERR: tools/rctest.c:507:19: note: each undeclared identifier is reported only once for each function it appears in
BUILDSTDERR: make[1]: *** [Makefile:6224: tools/rctest.o] Error 1
BUILDSTDERR: make[1]: *** Waiting for unfinished jobs....
BUILDSTDERR: tools/l2test.c: In function 'recv_mode':
BUILDSTDERR: tools/l2test.c:909:19: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGARP'?
BUILDSTDERR: 909 | if (ioctl(sk, SIOCGSTAMP, &tv) < 0) {
BUILDSTDERR: | ^~~~~~~~~~
BUILDSTDERR: | SIOCGARP
BUILDSTDERR: tools/l2test.c:909:19: note: each undeclared identifier is reported only once for each function it appears inGiven that those are tests that there's another 19 years to port, and that I don't know how to test, I went for the quickest fix.
Marcel Holtmann
maintainerHi Bastien,
Quoted 6 lines
The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name to fix the build.
---tools/l2test.c| 6 +++++-tools/rctest.c| 6 +++++-2 files changed, 10 insertions(+), 2 deletions(-)
patch has been applied.
Regards
Marcel