From 3e18240278671c39f28b15db9ff804b70e92e490 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 13 Feb 2004 03:49:50 +0000 Subject: [PATCH] Convert __FreeBSD__ tests to __FreeBSD__ and __DragonFly__ tests --- libexec/bootpd/getether.c | 4 ++-- libexec/rpc.rusersd/rusers_proc.c | 4 ++-- libexec/rtld-aout/i386/md.c | 6 +++--- libexec/rtld-aout/i386/md.h | 6 +++--- libexec/telnetd/ext.h | 6 ++++-- libexec/telnetd/utility.c | 12 ++++++------ 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c index 646a92b8f3..650014d3f6 100644 --- a/libexec/bootpd/getether.c +++ b/libexec/bootpd/getether.c @@ -8,7 +8,7 @@ * please let me know. * * $FreeBSD: src/libexec/bootpd/getether.c,v 1.9.2.3 2003/02/15 05:36:01 kris Exp $ - * $DragonFly: src/libexec/bootpd/getether.c,v 1.2 2003/06/17 04:27:07 dillon Exp $ + * $DragonFly: src/libexec/bootpd/getether.c,v 1.3 2004/02/13 03:49:47 dillon Exp $ */ #include @@ -111,7 +111,7 @@ getether(ifname, eap) #endif /* SUNOS */ -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* Thanks to John Brezak for this code. */ #include #include diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c index a328c9f79a..51f776b6b2 100644 --- a/libexec/rpc.rusersd/rusers_proc.c +++ b/libexec/rpc.rusersd/rusers_proc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/libexec/rpc.rusersd/rusers_proc.c,v 1.10 1999/08/28 00:09:56 peter Exp $ - * $DragonFly: src/libexec/rpc.rusersd/rusers_proc.c,v 1.2 2003/06/17 04:27:07 dillon Exp $ + * $DragonFly: src/libexec/rpc.rusersd/rusers_proc.c,v 1.3 2004/02/13 03:49:48 dillon Exp $ */ #ifdef DEBUG @@ -156,7 +156,7 @@ getidle(char *tty, char *display) idle = 0; if (*tty == 'X') { u_long kbd_idle, mouse_idle; -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) && !defined(__FreeBSD__) kbd_idle = getidle("kbd", NULL); #else kbd_idle = getidle("vga", NULL); diff --git a/libexec/rtld-aout/i386/md.c b/libexec/rtld-aout/i386/md.c index 84c189d162..6bce00f0a7 100644 --- a/libexec/rtld-aout/i386/md.c +++ b/libexec/rtld-aout/i386/md.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/libexec/rtld-aout/i386/md.c,v 1.17 1999/08/28 00:10:07 peter Exp $ - * $DragonFly: src/libexec/rtld-aout/i386/Attic/md.c,v 1.2 2003/06/17 04:27:08 dillon Exp $ + * $DragonFly: src/libexec/rtld-aout/i386/Attic/md.c,v 1.3 2004/02/13 03:49:50 dillon Exp $ */ #include @@ -256,7 +256,7 @@ long *savep; #ifndef RTLD -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) int netzmagic; #endif @@ -275,7 +275,7 @@ int magic, flags; else N_SETMAGIC((*hp), magic, MID_I386, flags); #endif -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) if (oldmagic) hp->a_midmag = magic; else if (netzmagic) diff --git a/libexec/rtld-aout/i386/md.h b/libexec/rtld-aout/i386/md.h index 53b238e8dc..bfbb5b9fa0 100644 --- a/libexec/rtld-aout/i386/md.h +++ b/libexec/rtld-aout/i386/md.h @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/libexec/rtld-aout/i386/md.h,v 1.18 1999/08/28 00:10:08 peter Exp $ - * $DragonFly: src/libexec/rtld-aout/i386/Attic/md.h,v 1.3 2003/11/14 03:54:31 dillon Exp $ + * $DragonFly: src/libexec/rtld-aout/i386/Attic/md.h,v 1.4 2004/02/13 03:49:50 dillon Exp $ */ #ifndef __MD_H__ @@ -62,9 +62,9 @@ #endif /* - * FreeBSD does it differently + * DragonFly does it differently */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) #define N_SET_FLAG(ex,f) (oldmagic ? (0) : \ (netzmagic == 0 ? \ N_SETMAGIC(ex, \ diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h index eb6fcc952e..582c4a75cc 100644 --- a/libexec/telnetd/ext.h +++ b/libexec/telnetd/ext.h @@ -32,7 +32,7 @@ * * @(#)ext.h 8.2 (Berkeley) 12/15/93 * $FreeBSD: src/libexec/telnetd/ext.h,v 1.7.2.4 2002/04/13 11:07:12 markm Exp $ - * $DragonFly: src/libexec/telnetd/ext.h,v 1.2 2003/06/17 04:27:08 dillon Exp $ + * $DragonFly: src/libexec/telnetd/ext.h,v 1.3 2004/02/13 03:49:50 dillon Exp $ */ /* @@ -198,7 +198,9 @@ extern struct { # ifdef ultrix # define DEFAULT_IM "\r\n\r\nULTRIX (%h) (%t)\r\n\r\r\n\r" # else -# ifdef __FreeBSD__ +# if defined(__DragonFly__) +# define DEFAULT_IM "\r\n\r\nDragonFly (%h) (%t)\r\n\r\r\n\r" +# elif defined(__FreeBSD__) # define DEFAULT_IM "\r\n\r\nFreeBSD (%h) (%t)\r\n\r\r\n\r" # else # define DEFAULT_IM "\r\n\r\n4.4 BSD UNIX (%h) (%t)\r\n\r\r\n\r" diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c index 1a898921b2..db9d52eeb1 100644 --- a/libexec/telnetd/utility.c +++ b/libexec/telnetd/utility.c @@ -32,10 +32,10 @@ * * @(#)utility.c 8.4 (Berkeley) 5/30/95 * $FreeBSD: src/libexec/telnetd/utility.c,v 1.13.2.4 2002/04/13 11:07:12 markm Exp $ - * $DragonFly: src/libexec/telnetd/utility.c,v 1.2 2003/06/17 04:27:08 dillon Exp $ + * $DragonFly: src/libexec/telnetd/utility.c,v 1.3 2004/02/13 03:49:50 dillon Exp $ */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) #include #include #endif @@ -365,7 +365,7 @@ putchr(int cc) *putlocation++ = cc; } -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) static char fmtstr[] = { "%+" }; #else static char fmtstr[] = { "%l:%M%P on %A, %d %B %Y" }; @@ -377,7 +377,7 @@ putf(char *cp, char *where) char *slash; time_t t; char db[100]; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) static struct utsname kerninfo; if (!*kerninfo.sysname) @@ -415,7 +415,7 @@ putf(char *cp, char *where) break; case 'd': -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) setlocale(LC_TIME, ""); #endif (void)time(&t); @@ -423,7 +423,7 @@ putf(char *cp, char *where) putstr(db); break; -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) case 's': putstr(kerninfo.sysname); break; -- 2.41.0