diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-08-30 12:47:20 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-08-30 12:47:20 +0000 |
| commit | dc40f10a0465ae1c9af6fabb5948e5aa7fa3e8f6 (patch) | |
| tree | 62883458b7a1c302c2eb897a7a871d60cb88847b | |
| parent | f9a4f9e265a3ed2c1a29d912734472630d335d27 (diff) | |
Move DT_NUM from <sys/exec_elf.h> to resolv.h in ld.so where it belongs.
ok guenther@
| -rw-r--r-- | libexec/ld.so/resolve.h | 5 | ||||
| -rw-r--r-- | sys/sys/exec_elf.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h index 24dbef66133..2e35fc888cc 100644 --- a/libexec/ld.so/resolve.h +++ b/libexec/ld.so/resolve.h @@ -1,4 +1,4 @@ -/* $OpenBSD: resolve.h,v 1.80 2016/08/23 06:46:17 kettenis Exp $ */ +/* $OpenBSD: resolve.h,v 1.81 2016/08/30 12:47:19 kettenis Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -33,6 +33,9 @@ #include <link.h> #include <dlfcn.h> +/* Number of low tags that are used saved internally (0 .. DT_NUM-1) */ +#define DT_NUM (DT_PREINIT_ARRAYSZ + 1) + struct load_list { struct load_list *next; void *start; diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h index f3186e6db6e..baf6f92d020 100644 --- a/sys/sys/exec_elf.h +++ b/sys/sys/exec_elf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.h,v 1.60 2016/08/23 06:46:17 kettenis Exp $ */ +/* $OpenBSD: exec_elf.h,v 1.61 2016/08/30 12:47:19 kettenis Exp $ */ /* * Copyright (c) 1995, 1996 Erik Theisen. All rights reserved. * @@ -525,9 +525,6 @@ typedef struct { #define DF_1_NODUMP 0x00001000 #define DF_1_CONLFAT 0x00002000 -/* ld.so: number of low tags that are used saved internally (0 .. DT_NUM-1) */ -#define DT_NUM (DT_PREINIT_ARRAYSZ+1) - /* Standard ELF hashing function */ unsigned int elf_hash(const unsigned char *name); |