This commit was generated by cvs2svn to compensate for changes in r435,

which included commits to RCS files with non-trunk default branches.

diff --git a/src/rx/rx.h b/src/rx/rx.h
index 6242ec3d42c28f92403785abbdde2dbf1d7bd071..7770be71c6ac92c6298ec50583a4d254197de53b 100644 (file)
--- 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 */

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index b3d9f07189024448605c7e9fa125b7a58e7dbc35..452adf138a32097ba4512562567a72fe987028c7 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,12 +1,18 @@
+SYS_NAME=@AFS_SYSNAME@
+MKAFS_OSTYPE=@MKAFS_OSTYPE@
+TOP_SRCDIR=@TOP_SRCDIR@
+TOP_INCDIR=@TOP_INCDIR@
+TOP_LIBDIR=@TOP_LIBDIR@
+COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 srcdir         = @srcdir@
-include @TOP_OBJDIR@/src/config/Makefile.config
+include ../config/Makefile.${SYS_NAME}
 
 SHELL          = /bin/sh
 
-CFLAGS         = -I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS         = -I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS}
 
-INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR}
+INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR}
 INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR}
 
 LIBS=\
@@ -336,7 +342,7 @@ mmap-cat: mmap-cat.o $(EXTRA_OBJS)
        $(CC) $(LDFLAGS) -o $@ mmap-cat.o $(EXTRA_OBJS) $(LIBS)
 
 run-tests: run-tests.in
-       (cd ../..; CONFIG_FILES=src/tests/run-tests CONFIG_HEADERS= $(SHELL) @TOP_OBJDIR@/config.status)
+       (cd ../..; CONFIG_FILES=src/tests/run-tests CONFIG_HEADERS= $(SHELL) @TOP_SRCDIR@/../config.status)
        @chmod +x run-tests
 
 #.c.o: