diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-29 08:45:54 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-29 08:45:54 +0000 |
| commit | 0ad115de732d7412195a161be8120691c14d5068 (patch) | |
| tree | 08ba5687621a1ef14a2c0b57b95f96e644ac8dd3 /usr.sbin/mkuboot | |
| parent | 2e7e5cd4af3167ce73b3cbffb2bb881fb446644c (diff) | |
Prefer <elf.h> to the non portable <sys/exec_elf.h>.
ok jca@, deraadt@
Diffstat (limited to 'usr.sbin/mkuboot')
| -rw-r--r-- | usr.sbin/mkuboot/copy_elf.c | 4 | ||||
| -rw-r--r-- | usr.sbin/mkuboot/mkuboot.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/mkuboot/copy_elf.c b/usr.sbin/mkuboot/copy_elf.c index 60e5e77e531..f301bdd10dc 100644 --- a/usr.sbin/mkuboot/copy_elf.c +++ b/usr.sbin/mkuboot/copy_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: copy_elf.c,v 1.5 2014/01/01 09:24:54 mcbride Exp $ */ +/* $OpenBSD: copy_elf.c,v 1.6 2017/10/29 08:45:53 mpi Exp $ */ /* * Copyright (c) 2013 Miodrag Vallat. @@ -22,7 +22,7 @@ #include <stdlib.h> #include <string.h> -#include <sys/exec_elf.h> +#include <elf.h> #if defined(ELFSIZE) && (ELFSIZE == 32) #define elfoff2h(x) letoh32(x) diff --git a/usr.sbin/mkuboot/mkuboot.c b/usr.sbin/mkuboot/mkuboot.c index 5a1b764319b..c7fb31de823 100644 --- a/usr.sbin/mkuboot/mkuboot.c +++ b/usr.sbin/mkuboot/mkuboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkuboot.c,v 1.7 2016/12/20 11:27:11 jsg Exp $ */ +/* $OpenBSD: mkuboot.c,v 1.8 2017/10/29 08:45:53 mpi Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -18,6 +18,8 @@ #include <sys/types.h> #include <sys/stat.h> + +#include <elf.h> #include <err.h> #include <fcntl.h> #include <stdint.h> @@ -27,7 +29,6 @@ #include <time.h> #include <unistd.h> #include <zlib.h> -#include <sys/exec_elf.h> #define IH_OS_OPENBSD 1 /* OpenBSD */ #define IH_OS_LINUX 5 /* Linux */ |