diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1996-10-27 23:22:19 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1996-10-27 23:22:19 +0000 |
| commit | 393aee94c02512403fbe69a995a15d6e59a2d187 (patch) | |
| tree | fabd46e20703c077fc0915e5e101fc3c36eb2ab6 | |
| parent | 07f37870a0f2ff2e737cdc8a6c2e9b7f8da3f7f0 (diff) | |
Check for __OpenBSD__. From Matthieu Herrb <Mathieu.Herrb@mipnet.fr>
| -rw-r--r-- | sys/arch/i386/isa/pcvt/Util/fontedit/fontedit.c | 24 | ||||
| -rw-r--r-- | usr.sbin/amd/config/mtab_bsd.c | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/i386/isa/pcvt/Util/fontedit/fontedit.c b/sys/arch/i386/isa/pcvt/Util/fontedit/fontedit.c index 36a3232f097..85f96bc9162 100644 --- a/sys/arch/i386/isa/pcvt/Util/fontedit/fontedit.c +++ b/sys/arch/i386/isa/pcvt/Util/fontedit/fontedit.c @@ -30,10 +30,10 @@ void clear_screen(); #ifdef BSD #include <sys/ioctl.h> #endif BSD -#if defined (__NetBSD__) || defined (__FreeBSD__) +#if defined (__NetBSD__) || defined (__OpenBSD__) || defined (__FreeBSD__) #include <sys/termios.h> #include <sys/ioctl.h> -#endif /* __NetBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ #include <signal.h> #ifdef CURFIX @@ -107,9 +107,9 @@ struct termio old_stty, new_stty; #ifdef BSD struct sgttyb old_stty, new_stty; #endif BSD -#if defined (__NetBSD__) || defined (__FreeBSD__) +#if defined (__NetBSD__) || defined(__OpenBSD__) || defined (__FreeBSD__) struct termios old_stty, new_stty; -#endif /* __NetBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ FILE * font_file = (FILE *)0; @@ -130,9 +130,9 @@ interrupt() #ifdef BSD ioctl( 0, TIOCSETP, &old_stty ); #endif BSD -#if defined (__NetBSD__) || defined (__FreeBSD__) +#if defined (__NetBSD__) || defined(__OpenBSD__) || defined (__FreeBSD__) ioctl( 0, TIOCSETA, &old_stty ); -#endif /* __NetBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ clear_screen(); exit( 0 ); } @@ -187,9 +187,9 @@ char *argv[]; #ifdef BSD ioctl( 0, TIOCGETP, &old_stty ); #endif BSD -#if defined (__NetBSD__) || defined (__FreeBSD__) +#if defined (__NetBSD__) || defined(__OpenBSD__) || defined (__FreeBSD__) ioctl( 0, TIOCGETA, &old_stty ); -#endif /* __NetBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ signal( SIGINT, (void *) interrupt ); new_stty = old_stty; #ifdef SYSV @@ -197,12 +197,12 @@ char *argv[]; new_stty.c_cc[VMIN] = 1; ioctl( 0, TCSETA, &new_stty ); #endif SYSV -#if defined (__NetBSD__) || defined (__FreeBSD__) +#if defined (__NetBSD__) || defined(__OpenBSD__) || defined (__FreeBSD__) new_stty.c_lflag &= ~ICANON; new_stty.c_lflag &= ~ECHO; new_stty.c_cc[VMIN] = 1; ioctl( 0, TIOCSETA, &new_stty ); -#endif /* __NetBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ #ifdef BSD new_stty.sg_flags |= CBREAK; new_stty.sg_flags &= ~ECHO; @@ -218,9 +218,9 @@ char *argv[]; #ifdef BSD ioctl( 0, TIOCSETP, &old_stty ); #endif BSD -#if defined (__NetBSD__) || defined (__FreeBSD__) +#if defined (__NetBSD__) || defined(__OpenBSD__) || defined (__FreeBSD__) ioctl( 0, TIOCSETA, &old_stty ); -#endif /* __NetBSD__ || __FreeBSD__ */ +#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ clear_screen(); /* Overwrite the old file. */ diff --git a/usr.sbin/amd/config/mtab_bsd.c b/usr.sbin/amd/config/mtab_bsd.c index 6d2bb72b8fd..2362593e2df 100644 --- a/usr.sbin/amd/config/mtab_bsd.c +++ b/usr.sbin/amd/config/mtab_bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtab_bsd.c,v 1.2 1996/03/25 15:54:52 niklas Exp $ */ +/* $OpenBSD: mtab_bsd.c,v 1.3 1996/10/27 23:22:16 millert Exp $ */ /* * Copyright (c) 1990 Jan-Simon Pendry @@ -52,7 +52,7 @@ struct statfs *mp; new_mp->mnt_fsname = strdup(mp->f_mntfromname); new_mp->mnt_dir = strdup(mp->f_mntonname); -#ifndef __NetBSD__ +#if !defined(__NetBSD__) && !defined(__OpenBSD__) switch (mp->f_type) { case MOUNT_UFS: ty = MTAB_TYPE_UFS; break; case MOUNT_NFS: ty = MTAB_TYPE_NFS; break; |