diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-06-24 14:52:06 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-06-24 14:52:06 +0000 |
| commit | 88e95b91302a82653053490ef1064fa903e75c27 (patch) | |
| tree | ecf7cbcc4f0d2769e0d57750999c1ee91c61979c /libc | |
| parent | cfd3e7c77b6bc0fae1f579fec477086e0d358662 (diff) | |
2010-06-24 Mark Heily <mark@heily.com>
* crypt/crypt.h, posix/unistd.h: Use __libc_block instead of
__block.
git-svn-id: svn://svn.eglibc.org/trunk@10807 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/ChangeLog.eglibc | 5 | ||||
| -rw-r--r-- | libc/crypt/crypt.h | 4 | ||||
| -rw-r--r-- | libc/posix/unistd.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index 2a42122b6..e5cdb6320 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,8 @@ +2010-06-24 Mark Heily <mark@heily.com> + + * crypt/crypt.h, posix/unistd.h: Use __libc_block instead of + __block. + 2010-03-31 Joseph Myers <joseph@codesourcery.com> * manual/Makefile (stamp-pkgvers): Substitute @@ for @ in diff --git a/libc/crypt/crypt.h b/libc/crypt/crypt.h index dcb89d813..f3c1c38f0 100644 --- a/libc/crypt/crypt.h +++ b/libc/crypt/crypt.h @@ -38,7 +38,7 @@ extern void setkey (__const char *__key) __THROW __nonnull ((1)); /* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt block in place. */ -extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); +extern void encrypt (char *__libc_block, int __edflag) __THROW __nonnull ((1)); #ifdef __USE_GNU /* Reentrant versions of the functions above. The additional argument @@ -65,7 +65,7 @@ extern void setkey_r (__const char *__key, struct crypt_data * __restrict __data) __THROW __nonnull ((1, 2)); -extern void encrypt_r (char *__block, int __edflag, +extern void encrypt_r (char *__libc_block, int __edflag, struct crypt_data * __restrict __data) __THROW __nonnull ((1, 3)); #endif diff --git a/libc/posix/unistd.h b/libc/posix/unistd.h index f8b84e3cb..9ed2c8489 100644 --- a/libc/posix/unistd.h +++ b/libc/posix/unistd.h @@ -1132,7 +1132,7 @@ extern char *crypt (__const char *__key, __const char *__salt) /* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt block in place. */ -extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); +extern void encrypt (char *__libc_block, int __edflag) __THROW __nonnull ((1)); /* Swab pairs bytes in the first N bytes of the area pointed to by |