[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-122-gc3d2504

[Alfred M. Szmidt]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  c3d250417c72aedbc31086f300bd3b2b7b7021d0 (commit)
      from  b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=c3d250417c72aedbc31086f300bd3b2b7b7021d0


commit c3d250417c72aedbc31086f300bd3b2b7b7021d0
Author: Alfred M. Szmidt <address@hidden>
Date:   Fri Oct 21 19:47:48 2011 +0200

    Only define PKTSIZE if needed.

diff --git a/ChangeLog b/ChangeLog
index 3ca99ef..bde311d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-21  Alfred M. Szmidt  <address@hidden>
+
+       * libinetutils/tftpsubs.c (PKTSIZE) [PKTSIZE]: Only define PKTSIZE if 
needed.
+       * src/tftp.c, src/tftpd.c: Likewise.
+
 2011-10-19  Alfred M. Szmidt  <address@hidden>
 
        * telnetd/telnetd.h [HAVE_STROPTS_H && !HAVE_IOCTL]: Only include
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index 4551d05..65ba8cd 100644
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -73,7 +73,10 @@
 
 #include "tftpsubs.h"
 
+/* Some systems define PKTSIZE in <arpa/tftp.h>.  */
+#ifndef PKTSIZE
 #define PKTSIZE SEGSIZE+4      /* should be moved to tftp.h */
+#endif
 
 struct bf
 {
diff --git a/src/tftp.c b/src/tftp.c
index 62c7540..9330cbd 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -80,7 +80,11 @@
 #include "progname.h"
 #include "tftpsubs.h"
 
+/* Some systems define PKTSIZE in <arpa/tftp.h>.  */
+#ifndef PKTSIZE
 #define PKTSIZE    SEGSIZE+4
+#endif
+
 char ackbuf[PKTSIZE];
 int timeout;
 jmp_buf timeoutbuf;
diff --git a/src/tftpd.c b/src/tftpd.c
index 49e7ae6..ea4122e 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -98,7 +98,10 @@ static int peer;
 static int rexmtval = TIMEOUT;
 static int maxtimeout = 5 * TIMEOUT;
 
+/* Some systems define PKTSIZE in <arpa/tftp.h>.  */
+#ifndef PKTSIZE
 #define PKTSIZE        SEGSIZE+4
+#endif
 static char buf[PKTSIZE];
 static char ackbuf[PKTSIZE];
 static struct sockaddr_storage from;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |    5 +++++
 libinetutils/tftpsubs.c |    3 +++
 src/tftp.c              |    4 ++++
 src/tftpd.c             |    3 +++
 4 files changed, 15 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils