From e5a620e1b137e86ad626a35d626a071f82497d9e Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Feb 2004 07:34:10 +0000 Subject: [PATCH] Remove obsolete __FreeBSD_version checks, add __DragonFly__ tests to existing __FreeBSD__ checks. --- lib/csu/common/crtbrand.c | 4 ++-- lib/libc/gen/getosreldate.3 | 4 ++-- lib/libc/net/getifaddrs.c | 5 +++-- lib/libc/rpc/svc_auth_des.c | 5 +++-- lib/libc/stdlib/malloc.c | 6 +++--- lib/libcr/gen/getosreldate.3 | 4 ++-- lib/libcr/net/getifaddrs.c | 5 +++-- lib/libcr/rpc/svc_auth_des.c | 5 +++-- lib/libcr/stdlib/malloc.c | 6 +++--- lib/libkvm/kvm_proc.c | 6 +++--- lib/libncp/ncpl_conn.c | 10 +--------- lib/libncp/ncpl_subr.c | 10 +--------- 12 files changed, 29 insertions(+), 41 deletions(-) diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c index 87ec58e599..3d5a84940a 100644 --- a/lib/csu/common/crtbrand.c +++ b/lib/csu/common/crtbrand.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/lib/csu/common/crtbrand.c,v 1.1.2.1 2000/10/30 20:32:24 obrien Exp $ - * $DragonFly: src/lib/csu/common/crtbrand.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/csu/common/crtbrand.c,v 1.3 2004/02/03 07:34:06 dillon Exp $ */ #include @@ -48,5 +48,5 @@ static const struct { sizeof(int32_t), ABI_NOTETYPE, ABI_VENDOR, - __FreeBSD_version + __DragonFly_version }; diff --git a/lib/libc/gen/getosreldate.3 b/lib/libc/gen/getosreldate.3 index 857f32de37..d54a4ec002 100644 --- a/lib/libc/gen/getosreldate.3 +++ b/lib/libc/gen/getosreldate.3 @@ -30,14 +30,14 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.1.2.1 2003/02/02 02:54:03 trhodes Exp $ -.\" $DragonFly: src/lib/libc/gen/getosreldate.3,v 1.2 2003/06/17 04:26:42 dillon Exp $ +.\" $DragonFly: src/lib/libc/gen/getosreldate.3,v 1.3 2004/02/03 07:34:07 dillon Exp $ .\" .Dd January 30, 2003 .Dt GETOSRELDATE 3 .Os .Sh NAME .Nm getosreldate -.Nd get the value of __FreeBSD_version +.Nd get the value of __DragonFly_version .Sh LIBRARY .Lb libc .Sh SYNOPSIS diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c index b4d4dfd11f..8b117242b1 100644 --- a/lib/libc/net/getifaddrs.c +++ b/lib/libc/net/getifaddrs.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/getifaddrs.c,v 1.1.2.4 2002/08/01 19:31:06 ume Exp $ */ -/* $DragonFly: src/lib/libc/net/getifaddrs.c,v 1.3 2003/07/13 05:45:05 dillon Exp $ */ +/* $DragonFly: src/lib/libc/net/getifaddrs.c,v 1.4 2004/02/03 07:34:09 dillon Exp $ */ /* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */ /* @@ -77,7 +77,8 @@ #define HAVE_IFAM_DATA #endif -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__FreeBSD__) || defined(__DragonFly__) #define HAVE_IFM_DATA #endif diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c index 17b6a65d60..34f4a1eccb 100644 --- a/lib/libc/rpc/svc_auth_des.c +++ b/lib/libc/rpc/svc_auth_des.c @@ -4,7 +4,7 @@ * * @(#)svcauth_des.c 2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.3 1999/08/28 00:00:48 peter Exp $ - * $DragonFly: src/lib/libc/rpc/svc_auth_des.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libc/rpc/svc_auth_des.c,v 1.3 2004/02/03 07:34:09 dillon Exp $ */ /* @@ -431,7 +431,8 @@ cache_spot(key, name, timestamp) } -#if (defined(sun) || defined(vax) || defined(__FreeBSD__)) +#if defined(sun) || defined(vax) || \ + defined(__FreeBSD__) || defined(__DragonFly__) /* * Local credential handling stuff. * NOTE: bsd unix dependent. diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 346c951f0d..09f97ed3c8 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.49.2.4 2001/12/29 08:10:14 knu Exp $ - * $DragonFly: src/lib/libc/stdlib/malloc.c,v 1.4 2003/09/06 08:19:16 asmodai Exp $ + * $DragonFly: src/lib/libc/stdlib/malloc.c,v 1.5 2004/02/03 07:34:10 dillon Exp $ * */ @@ -43,7 +43,7 @@ * */ -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) # if defined(__i386__) # define malloc_pageshift 12U # define malloc_minsize 16U @@ -64,7 +64,7 @@ static spinlock_t thread_lock = _SPINLOCK_INITIALIZER; # define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock); # define THREAD_UNLOCK() if (__isthreaded) _SPINUNLOCK(&thread_lock); -#endif /* __FreeBSD__ */ +#endif /* __FreeBSD__ || __DragonFly__ */ #if defined(__sparc__) && defined(sun) # define malloc_pageshift 12U diff --git a/lib/libcr/gen/getosreldate.3 b/lib/libcr/gen/getosreldate.3 index 6af7219fab..abfe8bad60 100644 --- a/lib/libcr/gen/getosreldate.3 +++ b/lib/libcr/gen/getosreldate.3 @@ -30,14 +30,14 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.1.2.1 2003/02/02 02:54:03 trhodes Exp $ -.\" $DragonFly: src/lib/libcr/gen/Attic/getosreldate.3,v 1.2 2003/06/17 04:26:42 dillon Exp $ +.\" $DragonFly: src/lib/libcr/gen/Attic/getosreldate.3,v 1.3 2004/02/03 07:34:10 dillon Exp $ .\" .Dd January 30, 2003 .Dt GETOSRELDATE 3 .Os .Sh NAME .Nm getosreldate -.Nd get the value of __FreeBSD_version +.Nd get the value of __DragonFly_version .Sh LIBRARY .Lb libc .Sh SYNOPSIS diff --git a/lib/libcr/net/getifaddrs.c b/lib/libcr/net/getifaddrs.c index 58cf69decc..7d64d1e160 100644 --- a/lib/libcr/net/getifaddrs.c +++ b/lib/libcr/net/getifaddrs.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/getifaddrs.c,v 1.1.2.4 2002/08/01 19:31:06 ume Exp $ */ -/* $DragonFly: src/lib/libcr/net/Attic/getifaddrs.c,v 1.3 2003/07/13 05:45:05 dillon Exp $ */ +/* $DragonFly: src/lib/libcr/net/Attic/getifaddrs.c,v 1.4 2004/02/03 07:34:10 dillon Exp $ */ /* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */ /* @@ -77,7 +77,8 @@ #define HAVE_IFAM_DATA #endif -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__FreeBSD__) || defined(__DragonFly__) #define HAVE_IFM_DATA #endif diff --git a/lib/libcr/rpc/svc_auth_des.c b/lib/libcr/rpc/svc_auth_des.c index 9e0d1c023e..508769b1b7 100644 --- a/lib/libcr/rpc/svc_auth_des.c +++ b/lib/libcr/rpc/svc_auth_des.c @@ -4,7 +4,7 @@ * * @(#)svcauth_des.c 2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.3 1999/08/28 00:00:48 peter Exp $ - * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth_des.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth_des.c,v 1.3 2004/02/03 07:34:10 dillon Exp $ */ /* @@ -431,7 +431,8 @@ cache_spot(key, name, timestamp) } -#if (defined(sun) || defined(vax) || defined(__FreeBSD__)) +#if defined(sun) || defined(vax) || \ + defined(__FreeBSD__) || defined(__DragonFly__) /* * Local credential handling stuff. * NOTE: bsd unix dependent. diff --git a/lib/libcr/stdlib/malloc.c b/lib/libcr/stdlib/malloc.c index 2b985af11f..8e60197b7e 100644 --- a/lib/libcr/stdlib/malloc.c +++ b/lib/libcr/stdlib/malloc.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.49.2.4 2001/12/29 08:10:14 knu Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/malloc.c,v 1.4 2003/12/08 13:56:35 eirikn Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/malloc.c,v 1.5 2004/02/03 07:34:10 dillon Exp $ * */ @@ -43,7 +43,7 @@ * */ -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) # if defined(__i386__) # define malloc_pageshift 12U # define malloc_minsize 16U @@ -64,7 +64,7 @@ static spinlock_t thread_lock = _SPINLOCK_INITIALIZER; # define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock); # define THREAD_UNLOCK() if (__isthreaded) _SPINUNLOCK(&thread_lock); -#endif /* __FreeBSD__ */ +#endif /* __FreeBSD__ || __DragonFly__ */ #if defined(__sparc__) && defined(sun) # define malloc_pageshift 12U diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index 9eaf6caf5b..6f287dcc43 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.25.2.3 2002/08/24 07:27:46 kris Exp $ - * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.4 2003/07/01 00:19:31 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.5 2004/02/03 07:34:10 dillon Exp $ * * @(#)kvm_proc.c 8.3 (Berkeley) 9/23/93 */ @@ -81,11 +81,11 @@ kvm_readswap(kd, p, va, cnt) u_long va; u_long *cnt; { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) /* XXX Stubbed out, our vm system is differnet */ _kvm_err(kd, kd->program, "kvm_readswap not implemented"); return(0); -#endif /* __FreeBSD__ */ +#endif } #endif diff --git a/lib/libncp/ncpl_conn.c b/lib/libncp/ncpl_conn.c index 9df6354896..f8228b7d25 100644 --- a/lib/libncp/ncpl_conn.c +++ b/lib/libncp/ncpl_conn.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libncp/ncpl_conn.c,v 1.2 1999/10/29 12:59:59 bp Exp $ - * $DragonFly: src/lib/libncp/ncpl_conn.c,v 1.2 2003/06/17 04:26:50 dillon Exp $ + * $DragonFly: src/lib/libncp/ncpl_conn.c,v 1.3 2004/02/03 07:34:10 dillon Exp $ */ /* @@ -276,11 +276,7 @@ int ncp_conn_cnt(void) { int error, cnt = 0, len = sizeof(cnt); -#if __FreeBSD_version < 400001 - error = sysctlbyname("net.ipx.ncp.conn_cnt", &cnt, &len, NULL, 0); -#else error = sysctlbyname("net.ncp.conn_cnt", &cnt, &len, NULL, 0); -#endif if (error) cnt = 0; return cnt; } @@ -394,11 +390,7 @@ ncp_conn_list(void) { len = cnt*(sizeof(struct ncp_conn_stat))+sizeof(int); p = malloc(len); if (p == NULL) return NULL; -#if __FreeBSD_version < 400001 - error = sysctlbyname("net.ipx.ncp.conn_stat", p, &len, NULL, 0); -#else error = sysctlbyname("net.ncp.conn_stat", p, &len, NULL, 0); -#endif if (error) { free(p); p = NULL; diff --git a/lib/libncp/ncpl_subr.c b/lib/libncp/ncpl_subr.c index 63958cbea5..4add94dc0f 100644 --- a/lib/libncp/ncpl_subr.c +++ b/lib/libncp/ncpl_subr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.3 2000/01/01 14:21:31 bp Exp $ - * $DragonFly: src/lib/libncp/ncpl_subr.c,v 1.2 2003/06/17 04:26:50 dillon Exp $ + * $DragonFly: src/lib/libncp/ncpl_subr.c,v 1.3 2004/02/03 07:34:10 dillon Exp $ */ #include @@ -219,20 +219,12 @@ ncp_initlib(void){ if (ncp_initialized) return 0; -#if __FreeBSD_version < 400001 - error = sysctlbyname("net.ipx.ncp.sysent", &sysentoffset, &len, NULL, 0); -#else error = sysctlbyname("net.ncp.sysent", &sysentoffset, &len, NULL, 0); -#endif if (error) { fprintf(stderr, "%s: can't find kernel module\n", __FUNCTION__); return error; } -#if __FreeBSD_version < 400001 - error = sysctlbyname("net.ipx.ncp.version", &kv, &kvlen, NULL, 0); -#else error = sysctlbyname("net.ncp.version", &kv, &kvlen, NULL, 0); -#endif if (error) { fprintf(stderr, "%s: kernel module is old, please recompile it.\n", __FUNCTION__); return error; -- 2.41.0