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_exec.h | |
| parent | 559b1c8aa8ad771e2e9d03c0b1e2a1cc30c6ea4c (diff) | |
Merge in NetBSD changes as if 3/19/97, undo some of ours.
Diffstat (limited to 'sys/compat/hpux/hpux_exec.h')
| -rw-r--r-- | sys/compat/hpux/hpux_exec.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/compat/hpux/hpux_exec.h b/sys/compat/hpux/hpux_exec.h index fb46131e916..6a9f741d272 100644 --- a/sys/compat/hpux/hpux_exec.h +++ b/sys/compat/hpux/hpux_exec.h @@ -1,5 +1,5 @@ -/* $OpenBSD: hpux_exec.h,v 1.3 1996/08/02 20:34:54 niklas Exp $ */ -/* $NetBSD: hpux_exec.h,v 1.6 1995/11/28 08:39:45 thorpej Exp $ */ +/* $OpenBSD: hpux_exec.h,v 1.4 1997/03/26 08:11:07 downsj Exp $ */ +/* $NetBSD: hpux_exec.h,v 1.7 1997/03/16 10:16:02 thorpej Exp $ */ /* * Copyright (c) 1995 Jason R. Thorpe. All rights reserved. @@ -82,31 +82,31 @@ struct hpux_exec { #define HPUX_MAGIC_DL 0x010d /* dynamic load library */ #define HPUX_MAGIC_SHL 0x010e /* shared library */ -#define HPUX__LDPGSZ 4096 /* align to this */ -#define HPUX__LDPGSHIFT 12 /* log2(HPUX__LDPGSZ) */ +#define HPUX_LDPGSZ 4096 /* align to this */ +#define HPUX_LDPGSHIFT 12 /* log2(HPUX_LDPGSZ) */ -#define HPUX__SEGMENT_ROUND(x) \ - (((x) + HPUX__LDPGSZ - 1) & ~(HPUX__LDPGSZ - 1)) +#define HPUX_SEGMENT_ROUND(x) \ + (((x) + HPUX_LDPGSZ - 1) & ~(HPUX_LDPGSZ - 1)) #define HPUX_TXTOFF(x, m) \ ((((m) == ZMAGIC) || \ ((m) == HPUX_MAGIC_SHL) || \ ((m) == HPUX_MAGIC_DL)) ? \ - HPUX__LDPGSZ : HPUX_EXEC_HDR_SIZE) + HPUX_LDPGSZ : HPUX_EXEC_HDR_SIZE) #define HPUX_DATAOFF(x, m) \ ((((m) == ZMAGIC) || \ ((m) == HPUX_MAGIC_SHL) || \ ((m) == HPUX_MAGIC_DL)) ? \ - (HPUX__LDPGSZ + HPUX__SEGMENT_ROUND((x).ha_text)) : \ + (HPUX_LDPGSZ + HPUX_SEGMENT_ROUND((x).ha_text)) : \ (HPUX_EXEC_HDR_SIZE + (x).ha_text)) #define HPUX_PASOFF(x, m) \ ((((m) == ZMAGIC) || \ ((m) == HPUX_MAGIC_SHL) || \ ((m) == HPUX_MAGIC_DL)) ? \ - (HPUX__LDPGSZ + HPUX__SEGMENT_ROUND((x).ha_text) + \ - HPUX__SEGMENT_ROUND((x).ha_data)) : \ + (HPUX_LDPGSZ + HPUX_SEGMENT_ROUND((x).ha_text) + \ + HPUX_SEGMENT_ROUND((x).ha_data)) : \ (HPUX_EXEC_HDR_SIZE + (x).ha_text + (x).ha_data)) #define HPUX_SYMOFF(x, m) (HPUX_PASOFF((x), (m)) + (x).ha_pascal) |