summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkstailey <kstailey@openbsd.org>1999-09-10 20:45:26 +0000
committerkstailey <kstailey@openbsd.org>1999-09-10 20:45:26 +0000
commitbbf9c565f51da180aa9b4cd402ab23e7103e2772 (patch)
tree69a9f91344a47e6d12ac4a9d274a61f577e12b95
parentinclude sys/exec.h before sys/exec_elf.h (diff)
downloadwireguard-openbsd-bbf9c565f51da180aa9b4cd402ab23e7103e2772.tar.xz
wireguard-openbsd-bbf9c565f51da180aa9b4cd402ab23e7103e2772.zip
undo previous
-rw-r--r--sys/compat/freebsd/freebsd_exec.c3
-rw-r--r--sys/sys/exec_elf.h6
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/compat/freebsd/freebsd_exec.c b/sys/compat/freebsd/freebsd_exec.c
index 643a28808ed..0ec938b3e01 100644
--- a/sys/compat/freebsd/freebsd_exec.c
+++ b/sys/compat/freebsd/freebsd_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: freebsd_exec.c,v 1.6 1999/09/10 20:42:59 kstailey Exp $ */
+/* $OpenBSD: freebsd_exec.c,v 1.7 1999/09/10 20:45:26 kstailey Exp $ */
/* $NetBSD: freebsd_exec.c,v 1.2 1996/05/18 16:02:08 christos Exp $ */
/*
@@ -39,7 +39,6 @@
#include <sys/exec.h>
#include <sys/resourcevar.h>
#include <vm/vm.h>
-#include <sys/exec.h>
#include <sys/exec_elf.h>
#include <sys/exec_olf.h>
diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h
index 9d81ce4d044..2beab244950 100644
--- a/sys/sys/exec_elf.h
+++ b/sys/sys/exec_elf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.h,v 1.17 1999/09/10 20:05:50 kstailey Exp $ */
+/* $OpenBSD: exec_elf.h,v 1.18 1999/09/10 20:47:13 kstailey Exp $ */
/*
* Copyright (c) 1995, 1996 Erik Theisen. All rights reserved.
*
@@ -482,13 +482,13 @@ void *elf64_copyargs __P((struct exec_package *, struct ps_strings *,
int exec_elf64_fixup __P((struct proc *, struct exec_package *));
char *elf64_check_brand __P((Elf64_Ehdr *));
#endif
-/* #ifdef _KERN_DO_ELF */
+#ifdef _KERN_DO_ELF
int exec_elf_makecmds __P((struct proc *, struct exec_package *));
void *elf_copyargs __P((struct exec_package *, struct ps_strings *,
void *, void *));
int exec_elf_fixup __P((struct proc *, struct exec_package *));
char *elf_check_brand __P((Elf32_Ehdr *));
-/* #endif */
+#endif
#endif /* _KERNEL */