Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libc supply weak alias for IPv6-related library addition...
details: https://anonhg.NetBSD.org/src/rev/0bbb607e528c
branches: trunk
changeset: 485290:0bbb607e528c
user: itojun <itojun%NetBSD.org@localhost>
date: Mon Apr 24 09:27:30 2000 +0000
description:
supply weak alias for IPv6-related library additions. sorry to be late.
diffstat:
lib/libc/include/namespace.h | 25 ++++++++++++++++++++++---
lib/libc/net/getaddrinfo.c | 9 ++++++++-
lib/libc/net/getifaddrs.c | 8 +++++++-
lib/libc/net/getnameinfo.c | 7 ++++++-
lib/libc/net/ip6opt.c | 12 +++++++++++-
lib/libc/net/rthdr.c | 13 ++++++++++++-
6 files changed, 66 insertions(+), 8 deletions(-)
diffs (228 lines):
diff -r 84bb28b7cc61 -r 0bbb607e528c lib/libc/include/namespace.h
--- a/lib/libc/include/namespace.h Mon Apr 24 08:40:21 2000 +0000
+++ b/lib/libc/include/namespace.h Mon Apr 24 09:27:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.48 2000/04/02 21:27:14 christos Exp $ */
+/* $NetBSD: namespace.h,v 1.49 2000/04/24 09:27:30 itojun Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -160,6 +160,8 @@
#define fdopen _fdopen
#define fgetln _fgetln
#define fnmatch _fnmatch
+#define freeaddrinfo _freeaddrinfo
+#define freeifaddrs _freeifaddrs
#define ftok _ftok
#define ftruncate _ftruncate
#define fts_children _fts_children
@@ -167,7 +169,9 @@
#define fts_open _fts_open
#define fts_read _fts_read
#define fts_set _fts_set
+#define gai_strerror _gai_strerror
#define get_myaddress _get_myaddress
+#define getaddrinfo _getaddrinfo
#define getbsize _getbsize
#define getcwd _getcwd
#define getdiskbyname _getdiskbyname
@@ -182,10 +186,12 @@
#define gethostbyaddr _gethostbyaddr
#define gethostbyname _gethostbyname
#define gethostname _gethostname
+#define getifaddrs _getifaddrs
#define getloadavg _getloadavg
#define getlogin _getlogin
#define getmntinfo _getmntinfo
#define getmode _getmode
+#define getnameinfo _getnameinfo
#define getnetbyaddr _getnetbyaddr
#define getnetbyname _getnetbyname
#define getnetent _getnetent
@@ -207,7 +213,7 @@
#define getservbyname _getservbyname
#define getservbyport _getservbyport
#define getservent _getservent
-#define getsubopt _getsubopt
+#define getsubopt _getsubopt
#define getttyent _getttyent
#define getttynam _getttynam
#define getusershell _getusershell
@@ -228,9 +234,22 @@
#define hesiod_resolve _hesiod_resolve
#define hesiod_to_bind _hesiod_to_bind
#define in6addr_any _in6addr_any
+#define in6addr_linklocal_allnodes _in6addr_linklocal_allnodes
#define in6addr_loopback _in6addr_loopback
#define in6addr_nodelocal_allnodes _in6addr_nodelocal_allnodes
-#define in6addr_linklocal_allnodes _in6addr_linklocal_allnodes
+#define inet6_option_alloc _inet6_option_alloc
+#define inet6_option_append _inet6_option_append
+#define inet6_option_find _inet6_option_find
+#define inet6_option_init _inet6_option_init
+#define inet6_option_next _inet6_option_next
+#define inet6_option_space _inet6_option_space
+#define inet6_rthdr_add _inet6_rthdr_add
+#define inet6_rthdr_getaddr _inet6_rthdr_getaddr
+#define inet6_rthdr_getflags _inet6_rthdr_getflags
+#define inet6_rthdr_init _inet6_rthdr_init
+#define inet6_rthdr_lasthop _inet6_rthdr_lasthop
+#define inet6_rthdr_segments _inet6_rthdr_segments
+#define inet6_rthdr_space _inet6_rthdr_space
#define inet_lnaof _inet_lnaof
#define inet_makeaddr _inet_makeaddr
#define inet_net_ntop _inet_net_ntop
diff -r 84bb28b7cc61 -r 0bbb607e528c lib/libc/net/getaddrinfo.c
--- a/lib/libc/net/getaddrinfo.c Mon Apr 24 08:40:21 2000 +0000
+++ b/lib/libc/net/getaddrinfo.c Mon Apr 24 09:27:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.37 2000/04/03 01:12:26 itojun Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.38 2000/04/24 09:27:31 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -76,6 +76,7 @@
* friends.
*/
+#include "namespace.h"
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@@ -103,6 +104,12 @@
#include <rpcsvc/ypclnt.h>
#endif
+#ifdef __weak_alias
+__weak_alias(getaddrinfo,_getaddrinfo)
+__weak_alias(freeaddrinfo,_freeaddrinfo)
+__weak_alias(gai_strerror,_gai_strerror)
+#endif
+
#define SUCCESS 0
#define ANY 0
#define YES 1
diff -r 84bb28b7cc61 -r 0bbb607e528c lib/libc/net/getifaddrs.c
--- a/lib/libc/net/getifaddrs.c Mon Apr 24 08:40:21 2000 +0000
+++ b/lib/libc/net/getifaddrs.c Mon Apr 24 09:27:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: getifaddrs.c,v 1.2 2000/02/23 15:29:18 itojun Exp $ */
+/* $NetBSD: getifaddrs.c,v 1.3 2000/04/24 09:27:31 itojun Exp $ */
/*
* Copyright (c) 1995, 1999
@@ -24,6 +24,7 @@
*
* BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
*/
+#include "namespace.h"
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -40,6 +41,11 @@
#include <stdlib.h>
#include <string.h>
+#ifdef __weak_alias
+__weak_alias(getifaddrs,_getifaddrs)
+__weak_alias(freeifaddrs,_freeifaddrs)
+#endif
+
#if !defined(AF_LINK)
#define SA_LEN(sa) sizeof(struct sockaddr)
#endif
diff -r 84bb28b7cc61 -r 0bbb607e528c lib/libc/net/getnameinfo.c
--- a/lib/libc/net/getnameinfo.c Mon Apr 24 08:40:21 2000 +0000
+++ b/lib/libc/net/getnameinfo.c Mon Apr 24 09:27:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.13 2000/03/17 06:11:55 christos Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.14 2000/04/24 09:27:31 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -39,6 +39,7 @@
* modified).
*/
+#include "namespace.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
@@ -50,6 +51,10 @@
#include <string.h>
#include <stddef.h>
+#ifdef __weak_alias
+__weak_alias(getnameinfo,_getnameinfo)
+#endif
+
#define SUCCESS 0
#define ANY 0
#define YES 1
diff -r 84bb28b7cc61 -r 0bbb607e528c lib/libc/net/ip6opt.c
--- a/lib/libc/net/ip6opt.c Mon Apr 24 08:40:21 2000 +0000
+++ b/lib/libc/net/ip6opt.c Mon Apr 24 09:27:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6opt.c,v 1.5 2000/01/23 00:09:19 mycroft Exp $ */
+/* $NetBSD: ip6opt.c,v 1.6 2000/04/24 09:27:31 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -29,6 +29,7 @@
* SUCH DAMAGE.
*/
+#include "namespace.h"
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -40,6 +41,15 @@
#include <string.h>
#include <stdio.h>
+#ifdef __weak_alias
+__weak_alias(inet6_option_alloc,_inet6_option_alloc)
+__weak_alias(inet6_option_append,_inet6_option_append)
+__weak_alias(inet6_option_find,_inet6_option_find)
+__weak_alias(inet6_option_init,_inet6_option_init)
+__weak_alias(inet6_option_next,_inet6_option_next)
+__weak_alias(inet6_option_space,_inet6_option_space)
+#endif
+
static int ip6optlen(u_int8_t *opt, u_int8_t *lim);
static void inet6_insert_padopt(u_char *p, size_t len);
diff -r 84bb28b7cc61 -r 0bbb607e528c lib/libc/net/rthdr.c
--- a/lib/libc/net/rthdr.c Mon Apr 24 08:40:21 2000 +0000
+++ b/lib/libc/net/rthdr.c Mon Apr 24 09:27:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rthdr.c,v 1.7 2000/02/29 18:24:31 itojun Exp $ */
+/* $NetBSD: rthdr.c,v 1.8 2000/04/24 09:27:31 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -29,6 +29,7 @@
* SUCH DAMAGE.
*/
+#include "namespace.h"
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -40,6 +41,16 @@
#include <string.h>
#include <stdio.h>
+#ifdef __weak_alias
+__weak_alias(inet6_rthdr_add,_inet6_rthdr_add)
+__weak_alias(inet6_rthdr_getaddr,_inet6_rthdr_getaddr)
+__weak_alias(inet6_rthdr_getflags,_inet6_rthdr_getflags)
+__weak_alias(inet6_rthdr_init,_inet6_rthdr_init)
+__weak_alias(inet6_rthdr_lasthop,_inet6_rthdr_lasthop)
+__weak_alias(inet6_rthdr_segments,_inet6_rthdr_segments)
+__weak_alias(inet6_rthdr_space,_inet6_rthdr_space)
+#endif
+
size_t
inet6_rthdr_space(type, seg)
int type, seg;
Home |
Main Index |
Thread Index |
Old Index