diff options
author | Jason Downs <downsj@cvs.openbsd.org> | 1997-03-26 08:11:10 +0000 |
---|---|---|
committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-03-26 08:11:10 +0000 |
commit | 82ad719d247059394654fa6b07180acfe9edf509 (patch) | |
tree | 5b85357f8e9fd9ddfbcb3aae8f2e64ce29b922de /sys/compat/hpux/hpux_compat.c | |
parent | 559b1c8aa8ad771e2e9d03c0b1e2a1cc30c6ea4c (diff) |
Merge in NetBSD changes as if 3/19/97, undo some of ours.
Diffstat (limited to 'sys/compat/hpux/hpux_compat.c')
-rw-r--r-- | sys/compat/hpux/hpux_compat.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c index ac6bf224d4e..1146a725a05 100644 --- a/sys/compat/hpux/hpux_compat.c +++ b/sys/compat/hpux/hpux_compat.c @@ -1,5 +1,5 @@ -/* $OpenBSD: hpux_compat.c,v 1.7 1997/02/23 21:40:55 downsj Exp $ */ -/* $NetBSD: hpux_compat.c,v 1.23 1996/01/06 12:44:11 thorpej Exp $ */ +/* $OpenBSD: hpux_compat.c,v 1.8 1997/03/26 08:11:04 downsj Exp $ */ +/* $NetBSD: hpux_compat.c,v 1.30 1997/03/16 10:13:12 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -107,7 +107,7 @@ int bsdtohpuxerrnomap[NERR] = { /*80*/ BERR,BERR, 11 }; -extern char hpux_sigcode[], hpux_esigcode[]; +extern char sigcode[], esigcode[]; extern struct sysent hpux_sysent[]; extern char *hpux_syscallnames[]; @@ -1191,8 +1191,6 @@ hpux_sys_getaccess(p, v, retval) /* hpux_to_bsd_uoff() is found in hpux_machdep.c */ -/* hpux_dumpu() is found in hpux_machdep.c */ - /* * Ancient HP-UX system calls. Some 9.x executables even use them! */ |