Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge the netbsd-1-2 branch back into the mainline.

Browse Source
This commit is contained in:
thorpej 1996-10-09 00:49:40 +00:00
parent 9df6319a29
commit 0644233c4c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/compat/ultrix/ultrix_ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ultrix_ioctl.c,v 1.4 1996/06/13 18:13:34 jonathan Exp $ */
/* $NetBSD: ultrix_ioctl.c,v 1.5 1996/10/09 00:49:40 thorpej Exp $ */
/* from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */
/*
@ -366,6 +366,12 @@ btios2stios(bt, st)
st->c_cc[4] = NATIVE_TO_EMUL_CC(bt->c_cc[VEOF]);
st->c_cc[5] = NATIVE_TO_EMUL_CC(bt->c_cc[VEOL]);
st->c_cc[6] = NATIVE_TO_EMUL_CC(bt->c_cc[VEOL2]);
/*
* XXX Should not be an #ifdef here (typo or not!) since
* XXX COMPAT_ULTRIX is implied if this code is being
* XXX compiled at all! Unfortunately, this code doesn't
* XXX currently compile, so leave it broken for now...
*/
#ifdef CMOPAT_ULTRIX
st->c_cc[7] = NATIVE_TO_EMUL_CC(bt->c_cc[VSWTCH]);
#else