diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-23 18:35:00 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-23 18:35:00 +0200 |
| commit | cae1d96323ba59248eaa9eedcffb6fac7e35a8cc (patch) | |
| tree | d24a2c26ec9c0d70d0a52c0a35de786058854984 /sysdeps/generic | |
| parent | d4192d9bce9e44adb2da4f2141713df9b335052f (diff) | |
| parent | 9b6bf8a30292288c9536efb72d80020f189bf9a6 (diff) | |
Merge commit 'origin/master' into fedora/master
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 30f9d23091..e18e60f73f 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -396,7 +396,7 @@ struct rtld_global uint32_t hashval; const char *name; const ElfW(Sym) *sym; - const struct link_map *map; + struct link_map *map; } *entries; size_t size; size_t n_elements; |