Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netkey avoid symbol conflict with "sin()".
details: https://anonhg.NetBSD.org/src/rev/ad8f209ae990
branches: trunk
changeset: 513878:ad8f209ae990
user: itojun <itojun%NetBSD.org@localhost>
date: Thu Aug 16 14:28:54 2001 +0000
description:
avoid symbol conflict with "sin()".
diffstat:
sys/netkey/key_debug.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (33 lines):
diff -r a623527ffec3 -r ad8f209ae990 sys/netkey/key_debug.c
--- a/sys/netkey/key_debug.c Thu Aug 16 14:27:19 2001 +0000
+++ b/sys/netkey/key_debug.c Thu Aug 16 14:28:54 2001 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: key_debug.c,v 1.17 2001/08/12 11:52:44 itojun Exp $ */
-/* $KAME: key_debug.c,v 1.25 2000/07/24 13:23:12 itojun Exp $ */
+/* $NetBSD: key_debug.c,v 1.18 2001/08/16 14:28:54 itojun Exp $ */
+/* $KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -669,7 +669,7 @@
kdebug_sockaddr(addr)
struct sockaddr *addr;
{
- struct sockaddr_in *sin;
+ struct sockaddr_in *sin4;
#ifdef INET6
struct sockaddr_in6 *sin6;
#endif
@@ -683,9 +683,9 @@
switch (addr->sa_family) {
case AF_INET:
- sin = (struct sockaddr_in *)addr;
- printf(" port=%u\n", ntohs(sin->sin_port));
- ipsec_hexdump((caddr_t)&sin->sin_addr, sizeof(sin->sin_addr));
+ sin4 = (struct sockaddr_in *)addr;
+ printf(" port=%u\n", ntohs(sin4->sin_port));
+ ipsec_hexdump((caddr_t)&sin4->sin_addr, sizeof(sin4->sin_addr));
break;
#ifdef INET6
case AF_INET6:
Home |
Main Index |
Thread Index |
Old Index