diff options
| author | Roland McGrath <roland@gnu.org> | 2002-04-27 21:21:42 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-04-27 21:21:42 +0000 |
| commit | e74e95d8559ee79b61e0cc7eb766555c4c9c1dba (patch) | |
| tree | f7d3b96f171d6246728f11715fe607d8a3a9501a /exec/priv.h | |
| parent | 7ccb92aa6a0493b9896c8219de4b2cd0d4b37bb3 (diff) | |
2002-04-27 Roland McGrath <roland@frob.com>
* priv.h: Include <link.h> to get ElfW macro.
* priv.h, exec.c, main.c, hostarch.c: Use `ElfW(TYPE)' in place
of `Elf32_TYPE' throughout.
Diffstat (limited to 'exec/priv.h')
| -rw-r--r-- | exec/priv.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/exec/priv.h b/exec/priv.h index 7b202735..bb671e95 100644 --- a/exec/priv.h +++ b/exec/priv.h @@ -1,5 +1,5 @@ /* GNU Hurd standard exec server, private declarations. - Copyright (C) 1992,93,94,95,96,99,2000 Free Software Foundation, Inc. + Copyright (C) 1992,93,94,95,96,99,2000,02 Free Software Foundation, Inc. Written by Roland McGrath. This file is part of the GNU Hurd. @@ -33,6 +33,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #endif #include <elf.h> +#include <link.h> /* This gives us the ElfW macro. */ #include <fcntl.h> #include "exec_S.h" @@ -127,7 +128,7 @@ struct execdata union /* Interpreter section giving name of file. */ { asection *section; - const Elf32_Phdr *phdr; + const ElfW(Phdr) *phdr; } interp; memory_object_t filemap, cntlmap; struct shared_io *cntl; @@ -149,15 +150,15 @@ struct execdata /* Program header table read from the executable. After `check' this is a pointer into the mapping window. By `load' it is local alloca'd storage. */ - Elf32_Phdr *phdr; - Elf32_Word phnum; /* Number of program header table elements. */ + ElfW(Phdr) *phdr; + ElfW(Word) phnum; /* Number of program header table elements. */ int anywhere; /* Nonzero if image can go anywhere. */ vm_address_t loadbase; /* Actual mapping location. */ } elf; } info; }; -error_t elf_machine_matches_host (Elf32_Half e_machine); +error_t elf_machine_matches_host (ElfW(Half) e_machine); void finish (struct execdata *, int dealloc_file_port); |