Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename HAVE_STRUCT_SOCKADDR_SA_LEN to HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 

to accurately reflect the structure member being used.
This commit is contained in:
lukem 2007-12-05 00:15:25 +00:00
parent 8533522c01
commit d4aed48135
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/ftp/ftp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ftp.c,v 1.152 2007/07/22 05:02:50 lukem Exp $ */
/* $NetBSD: ftp.c,v 1.153 2007/12/05 00:15:25 lukem Exp $ */
/*-
* Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
@ -99,7 +99,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
__RCSID("$NetBSD: ftp.c,v 1.152 2007/07/22 05:02:50 lukem Exp $");
__RCSID("$NetBSD: ftp.c,v 1.153 2007/12/05 00:15:25 lukem Exp $");
#endif
#endif /* not lint */
@ -146,12 +146,12 @@ struct sockinet {
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
@ -2114,7 +2114,7 @@ ai_unmapped(struct addrinfo *ai)
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);

4
usr.bin/ftp/ftp_var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ftp_var.h,v 1.75 2007/07/22 05:02:50 lukem Exp $ */
/* $NetBSD: ftp_var.h,v 1.76 2007/12/05 00:15:25 lukem Exp $ */
/*-
* Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
@ -328,7 +328,7 @@ extern struct option optiontab[];
#define FREEPTR(x) if ((x) != NULL) { free(x); (x) = NULL; }
#ifdef BSD4_4
# define HAVE_STRUCT_SOCKADDR_SA_LEN 1
# define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
#endif
#ifdef NO_LONG_LONG

4
usr.bin/ftp/version.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.70 2007/08/22 06:51:41 lukem Exp $ */
/* $NetBSD: version.h,v 1.71 2007/12/05 00:15:25 lukem Exp $ */
/*-
* Copyright (c) 1999-2007 The NetBSD Foundation, Inc.
* All rights reserved.
@ -40,5 +40,5 @@
#endif
#ifndef FTP_VERSION
#define FTP_VERSION "20070822"
#define FTP_VERSION "20071205"
#endif