aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-06 21:10:50 +0000
committerRoland McGrath <roland@gnu.org>2002-08-06 21:10:50 +0000
commite78f615d52703ec18f773e3778d0dbfc6aa3be35 (patch)
tree23805eaedbb7027869acf401a80fd534162e44a3 /sysdeps
parent1ab62b326e22ee3c9ab8b8b4144953698bc82cff (diff)
downloadglibc-e78f615d52703ec18f773e3778d0dbfc6aa3be35.tar
glibc-e78f615d52703ec18f773e3778d0dbfc6aa3be35.tar.gz
glibc-e78f615d52703ec18f773e3778d0dbfc6aa3be35.tar.bz2
glibc-e78f615d52703ec18f773e3778d0dbfc6aa3be35.zip
* include/getopt.h: But private decls inside [_GETOPT_H].
Use libc_hidden_proto for getopt_long, getopt_long_only. * posix/getopt1.c [_LIBC]: Include <getopt.h> instead of "getopt.h". Add libc_hidden_def. * sysdeps/generic/unwind-dw2-fde-glibc.c [_LIBC] (dl_iterate_phdr): Define as a macro for __dl_iterate_phdr. * inet/getnetgrent_r.c (internal_setnetgrent): Renamed from __ name, made static. Add __ name as a strong alias. (internal_endnetgrent): Likewise. (internal_getnetgrent_r): Likewise.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/unwind-dw2-fde-glibc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sysdeps/generic/unwind-dw2-fde-glibc.c b/sysdeps/generic/unwind-dw2-fde-glibc.c
index 2f7517441c..746e26b99a 100644
--- a/sysdeps/generic/unwind-dw2-fde-glibc.c
+++ b/sysdeps/generic/unwind-dw2-fde-glibc.c
@@ -67,7 +67,7 @@ struct unw_eh_frame_hdr
/* Like base_of_encoded_value, but take the base from a struct object
instead of an _Unwind_Context. */
-
+
static _Unwind_Ptr
base_from_cb_data (unsigned char encoding, struct unw_eh_callback_data *data)
{
@@ -80,7 +80,7 @@ base_from_cb_data (unsigned char encoding, struct unw_eh_callback_data *data)
case DW_EH_PE_pcrel:
case DW_EH_PE_aligned:
return 0;
-
+
case DW_EH_PE_textrel:
return (_Unwind_Ptr) data->tbase;
case DW_EH_PE_datarel:
@@ -250,6 +250,10 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
return 1;
}
+# ifdef _LIBC
+# define dl_iterate_phdr __dl_iterate_phdr
+# endif
+
fde *
_Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases)
{