diff options
author | John Polstra <jdp@FreeBSD.org> | 1997-12-06 17:59:52 +0000 |
---|---|---|
committer | John Polstra <jdp@FreeBSD.org> | 1997-12-06 17:59:52 +0000 |
commit | befb229b6f7bd2bbb7c8e46c9b64481c7ad59d89 (patch) | |
tree | 0127418e279d1786c0058e6dfc5d99577887cd36 /include/link.h | |
parent | 79031fd714c20e71b93271bce405b65905236680 (diff) | |
download | src-befb229b6f7bd2bbb7c8e46c9b64481c7ad59d89.tar.gz src-befb229b6f7bd2bbb7c8e46c9b64481c7ad59d89.zip |
Move nlist related defines from link.h into nlist.h. Clean up
nlist.h.
Notes
Notes:
svn path=/head/; revision=31584
Diffstat (limited to 'include/link.h')
-rw-r--r-- | include/link.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/link.h b/include/link.h index 870e13d4d8fa..5ff1f7857b1f 100644 --- a/include/link.h +++ b/include/link.h @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: link.h,v 1.15 1997/11/22 03:34:39 brian Exp $ + * $Id: link.h,v 1.16 1997/11/28 19:05:11 jdp Exp $ */ /* @@ -84,6 +84,8 @@ struct so_map { /* Shared Object Map */ struct nzlist { struct nlist nlist; u_long nz_size; +}; + #define nz_un nlist.n_un #define nz_strx nlist.n_un.n_strx #define nz_name nlist.n_un.n_name @@ -91,18 +93,6 @@ struct nzlist { #define nz_value nlist.n_value #define nz_desc nlist.n_desc #define nz_other nlist.n_other -}; - -#define N_AUX(p) ((p)->n_other & 0xf) -#define N_BIND(p) (((unsigned int)(p)->n_other >> 4) & 0xf) -#define N_OTHER(r, v) (((unsigned int)(r) << 4) | ((v) & 0xf)) - -#define AUX_OBJECT 1 -#define AUX_FUNC 2 -/*#define BIND_LOCAL 0 not used */ -/*#define BIND_GLOBAL 1 not used */ -#define BIND_WEAK 2 - /* * The `section_dispatch_table' structure contains offsets to various data @@ -290,4 +280,3 @@ struct hints_bucket { #define _PATH_LD_HINTS "/var/run/ld.so.hints" #endif /* _LINK_H_ */ - |