diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-08-14 22:21:54 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-14 22:21:54 -0400 |
| commit | f3ed22607e8bf724b697c16876dbb76bb2418db6 (patch) | |
| tree | f496a9d8b5e41e850f613669bad6d066d0af0cf8 /sysdeps | |
| parent | a60df2c3db52b66fd3190c92ad9bc9b972e0d1fc (diff) | |
| parent | 69f630971184cae39d578709089d175c4b743390 (diff) | |
| download | glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar.gz glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar.bz2 glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/resource.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index a5f0a25ccc..8c7f00fc5d 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; - struct link_map *map; + const struct link_map *map; } *entries; size_t size; size_t n_elements; diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h index 04d33e4aa8..5c00b8fbb9 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/resource.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h @@ -130,11 +130,11 @@ enum __rlimit_resource #ifndef __USE_FILE_OFFSET64 # define RLIM_INFINITY ((long int)(~0UL >> 1)) #else -# define RLIM_INFINITY 0x7fffffffffffffffLL +# define RLIM_INFINITY 0xffffffffffffffffLL #endif #ifdef __USE_LARGEFILE64 -# define RLIM64_INFINITY 0x7fffffffffffffffLL +# define RLIM64_INFINITY 0xffffffffffffffffLL #endif #endif |