diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/amd/config/os-bsd44.h | 8 | ||||
| -rw-r--r-- | usr.sbin/bootpd/getether.c | 2 | ||||
| -rw-r--r-- | usr.sbin/eeprom/getdate.y | 6 | ||||
| -rw-r--r-- | usr.sbin/pppd/nametoaddr.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/amd/config/os-bsd44.h b/usr.sbin/amd/config/os-bsd44.h index 21d4d3ef310..8763532e2ec 100644 --- a/usr.sbin/amd/config/os-bsd44.h +++ b/usr.sbin/amd/config/os-bsd44.h @@ -1,4 +1,4 @@ -/* $OpenBSD: os-bsd44.h,v 1.4 1996/03/25 15:54:53 niklas Exp $ */ +/* $OpenBSD: os-bsd44.h,v 1.5 1996/08/22 00:34:28 deraadt Exp $ */ /* * Copyright (c) 1990 Jan-Simon Pendry @@ -70,7 +70,7 @@ /* * 4.4 doesn't provide NIS, but NetBSD does. */ -#ifndef __NetBSD__ +#if !(defined(__NetBSD__) || defined(__OpenBSD__)) #undef HAS_NIS_MAPS #endif @@ -97,7 +97,7 @@ #undef MTAB_TYPE_UFS #define MTAB_TYPE_UFS "ufs" #define MTAB_TYPE_MFS "mfs" -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__OpenBSD__) #undef MTYPE_TYPE #define MTYPE_TYPE char * #endif @@ -178,7 +178,7 @@ struct mntent { * Type of a file handle */ #undef NFS_FH_TYPE -#if __NetBSD__ +#if defined(__NetBSD__) || defined(__OpenBSD__) #define NFS_FH_TYPE void * #endif diff --git a/usr.sbin/bootpd/getether.c b/usr.sbin/bootpd/getether.c index d131b50f7f8..12ac7d0832d 100644 --- a/usr.sbin/bootpd/getether.c +++ b/usr.sbin/bootpd/getether.c @@ -101,7 +101,7 @@ getether(ifname, eap) #endif /* SUNOS */ -#if defined(__386BSD__) || defined(__NetBSD__) +#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) /* Thanks to John Brezak <brezak@ch.hp.com> for this code. */ #include <sys/ioctl.h> #include <net/if.h> diff --git a/usr.sbin/eeprom/getdate.y b/usr.sbin/eeprom/getdate.y index a653702da8b..68549384469 100644 --- a/usr.sbin/eeprom/getdate.y +++ b/usr.sbin/eeprom/getdate.y @@ -42,7 +42,7 @@ char *alloca (); tricks are need, but defaults to using the gettimeofday system call. Include <sys/time.h> if that will be used. */ -#if !defined (USG) && !defined (sgi) && !defined (__NetBSD__) +#if !defined (USG) && !defined (sgi) && !defined (__NetBSD__) && !defined(__OpenBSD__) #include <sys/time.h> #endif @@ -100,7 +100,7 @@ extern struct tm *localtime(); #if !defined(lint) && !defined(SABER) static char RCS[] = - "$Header: /cvs/OpenBSD/src/usr.sbin/eeprom/getdate.y,v 1.1 1995/10/18 08:47:33 deraadt Exp $"; + "$Header: /cvs/OpenBSD/src/usr.sbin/eeprom/getdate.y,v 1.2 1996/08/22 00:34:05 deraadt Exp $"; #endif /* !defined(lint) && !defined(SABER) */ @@ -874,7 +874,7 @@ get_date(p, now) #if sgi ftz.timezone = (int) _timezone / 60; #else /* not sgi */ -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__OpenBSD__) ftz.timezone = 0; #else /* neither sgi nor NetBSD */ #if defined (USG) diff --git a/usr.sbin/pppd/nametoaddr.c b/usr.sbin/pppd/nametoaddr.c index 8f8110c3aba..484f54894ab 100644 --- a/usr.sbin/pppd/nametoaddr.c +++ b/usr.sbin/pppd/nametoaddr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nametoaddr.c,v 1.1 1996/03/25 15:55:50 niklas Exp $ */ +/* $OpenBSD: nametoaddr.c,v 1.2 1996/08/22 00:33:40 deraadt Exp $ */ /* From NetBSD: nametoaddr.c,v 1.3 1995/04/29 05:42:23 cgd Exp */ /* @@ -30,12 +30,12 @@ from: static char rcsid[] = "@(#) Header: nametoaddr.c,v 1.21 94/06/20 19:07:54 leres Exp (LBL)"; #else -static char rcsid[] = "$OpenBSD: nametoaddr.c,v 1.1 1996/03/25 15:55:50 niklas Exp $"; +static char rcsid[] = "$OpenBSD: nametoaddr.c,v 1.2 1996/08/22 00:33:40 deraadt Exp $"; #endif #endif #include <stdio.h> -#ifdef __NetBSD__ +#if define(__NetBSD__) || defined(__OpenBSD__) #include <stdlib.h> #include <string.h> #endif |