From 95f2eb8cc4753d474ac8ace2cf132c4ad7b05574 Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Sat, 26 Jan 2002 03:41:45 +0000 Subject: [PATCH] STABLE12-rx-dont-include-arraysize-in-offsetof-20020125 so this compiles on irix (cherry picked from commit 62bc57574aabfccf9e3684e7f0fe99dcbf9ad1e3) --- src/rx/rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rx/rx.h b/src/rx/rx.h index 6242ec3d4..7770be71c 100644 --- a/src/rx/rx.h +++ b/src/rx/rx.h @@ -736,7 +736,7 @@ struct rx_ackPacket { #define RX_ACK_TYPE_ACK 1 /* I have this packet, although I may discard it later */ /* The packet size transmitted for an acknowledge is adjusted to reflect the actual size of the acks array. This macro defines the size */ -#define rx_AckDataSize(nAcks) (3 + offsetof(struct rx_ackPacket, acks[nAcks])) +#define rx_AckDataSize(nAcks) (3 + nAcks + offsetof(struct rx_ackPacket, acks[0])) #define RX_CHALLENGE_TIMEOUT 2 /* Number of seconds before another authentication request packet is generated */ #define RX_CHALLENGE_MAXTRIES 50 /* Max # of times we resend challenge */ -- 2.39.5