[commits] r10807 - in /trunk/libc: ChangeLog.eglibc crypt/crypt.h posix/unistd.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Jun 24 07:52:06 2010
New Revision: 10807

Log:
2010-06-24  Mark Heily  <mark@xxxxxxxxx>

	* crypt/crypt.h, posix/unistd.h: Use __libc_block instead of
	__block.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/crypt/crypt.h
    trunk/libc/posix/unistd.h

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Thu Jun 24 07:52:06 2010
@@ -1,3 +1,8 @@
+2010-06-24  Mark Heily  <mark@xxxxxxxxx>
+
+	* crypt/crypt.h, posix/unistd.h: Use __libc_block instead of
+	__block.
+
 2010-03-31  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* manual/Makefile (stamp-pkgvers): Substitute @@ for @ in

Modified: trunk/libc/crypt/crypt.h
==============================================================================
--- trunk/libc/crypt/crypt.h (original)
+++ trunk/libc/crypt/crypt.h Thu Jun 24 07:52:06 2010
@@ -38,7 +38,7 @@
 
 /* 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 @@
 		      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

Modified: trunk/libc/posix/unistd.h
==============================================================================
--- trunk/libc/posix/unistd.h (original)
+++ trunk/libc/posix/unistd.h Thu Jun 24 07:52:06 2010
@@ -1132,7 +1132,7 @@
 
 /* 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