pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/tnftp/files/src Fix build on OSF/1 by using the co...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b75b3d7d784b
branches:  trunk
changeset: 534627:b75b3d7d784b
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Oct 28 10:40:36 2007 +0000

description:
Fix build on OSF/1 by using the correct config.h define when setting
sin.sin_len. No reply from lukem in ~2 weeks but I am confident this is the
correct fix.

diffstat:

 net/tnftp/files/src/ftp.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r ee5b99eeb1bc -r b75b3d7d784b net/tnftp/files/src/ftp.c
--- a/net/tnftp/files/src/ftp.c Sun Oct 28 10:27:34 2007 +0000
+++ b/net/tnftp/files/src/ftp.c Sun Oct 28 10:40:36 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftp.c,v 1.7 2007/08/07 02:07:02 lukem Exp $    */
+/*     $NetBSD: ftp.c,v 1.8 2007/10/28 10:40:36 tnn Exp $      */
 /*     from    NetBSD: ftp.c,v 1.152 2007/07/22 05:02:50 lukem Exp     */
 
 /*-
@@ -154,12 +154,12 @@
                struct sockaddr_in6 su_sin6;
 #endif
        } si_su;
-#if !defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
+#if !defined(HAVE_STRUCT_SOCKADDR_IN_SIN_LEN)
        int     si_len;
 #endif
 };
 
-#if !defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
+#if !defined(HAVE_STRUCT_SOCKADDR_IN_SIN_LEN)
 # define su_len                si_len
 #else
 # define su_len                si_su.su_sin.sin_len
@@ -2122,7 +2122,7 @@
        sin.sin_port = sin6->sin6_port;
 
        ai->ai_family = AF_INET;
-#if defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
+#if defined(HAVE_STRUCT_SOCKADDR_IN_SIN_LEN)
        sin.sin_len = len;
 #endif
        memcpy(ai->ai_addr, &sin, len);



Home | Main Index | Thread Index | Old Index