diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-01 19:26:53 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-01 19:26:53 +0200 |
| commit | 5a92339ad317991475c5628c073a3411447775d5 (patch) | |
| tree | f6f8fc8f28093445c97db2ddf54bc74bbedf8349 /csu | |
| parent | 12ccc71de7e6f111cb57ddb635847d704689ae4e (diff) | |
| parent | d5860b5273bc00632c65b43cb931d3238db0ab57 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Conflicts:
sysdeps/mach/hurd/i386/init-first.c
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/check_fds.c | 2 | ||||
| -rw-r--r-- | csu/init-first.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/csu/check_fds.c b/csu/check_fds.c index 3616e6c60f..9b83828a81 100644 --- a/csu/check_fds.c +++ b/csu/check_fds.c @@ -60,7 +60,7 @@ check_one_fd (int fd, int mode) /* Something is wrong with this descriptor, it's probably not opened. Open /dev/null so that the SUID program we are - about to start does not accidently use this descriptor. */ + about to start does not accidentally use this descriptor. */ int nullfd = open_not_cancel (name, mode, 0); /* We are very paranoid here. With all means we try to ensure diff --git a/csu/init-first.c b/csu/init-first.c index 89d8d9634b..f0ebc94b8d 100644 --- a/csu/init-first.c +++ b/csu/init-first.c @@ -29,7 +29,7 @@ #include <ldsodefs.h> -/* Set nonzero if we have to be prepared for more then one libc being +/* Set nonzero if we have to be prepared for more than one libc being used in the process. Safe assumption if initializer never runs. */ int __libc_multiple_libcs attribute_hidden = 1; |