diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-03-15 05:32:11 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-03-15 05:32:11 +0000 |
commit | d9cb1a7dad1f2638cdaa12ff8ade54f9c24c64bc (patch) | |
tree | 6cc6cb94f13c173b2d52c0f43fd3a36c967830ab /elf/ldsodefs.h | |
parent | 36388ac46a351a923a7690a8b0e88266bab16098 (diff) | |
download | glibc-d9cb1a7dad1f2638cdaa12ff8ade54f9c24c64bc.zip glibc-d9cb1a7dad1f2638cdaa12ff8ade54f9c24c64bc.tar.gz glibc-d9cb1a7dad1f2638cdaa12ff8ade54f9c24c64bc.tar.bz2 |
Update.
* elf/dl-deps.c (_dl_map_object_deps): Change return type and remove
last parameter. Move code to add map to global scope from here...
* elf/dl-open.c (dl_open_worker): ...here.
* elf/ldsodefs.h: Adjust declaration of _dl_map_object_deps.
* elf/rtld.c: Adjust call to _dl_map_object_deps.
Diffstat (limited to 'elf/ldsodefs.h')
-rw-r--r-- | elf/ldsodefs.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/elf/ldsodefs.h b/elf/ldsodefs.h index 15b7cc6..15f89db 100644 --- a/elf/ldsodefs.h +++ b/elf/ldsodefs.h @@ -1,5 +1,5 @@ /* Run-time dynamic linker data structures for loaded ELF shared objects. - Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -238,10 +238,9 @@ extern struct link_map *_dl_map_object (struct link_map *loader, MAP->l_searchlist. PRELOADS points to a vector of NPRELOADS previously loaded objects that will be inserted into MAP->l_searchlist after MAP but before its dependencies. */ -extern unsigned int _dl_map_object_deps (struct link_map *map, - struct link_map **preloads, - unsigned int npreloads, - int trace_mode, int global_scope) +extern void _dl_map_object_deps (struct link_map *map, + struct link_map **preloads, + unsigned int npreloads, int trace_mode) internal_function; /* Cache the locations of MAP's hash table. */ |