Author: aurel32 Date: 2010-06-24 18:29:22 +0000 (Thu, 24 Jun 2010) New Revision: 4357
Added: glibc-package/trunk/debian/patches/any/cvs-__block.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: * Add patches/any/cvs-__block.diff from upstream to not conflict with clang. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2010-06-24 17:41:11 UTC (rev 4356) +++ glibc-package/trunk/debian/changelog 2010-06-24 18:29:22 UTC (rev 4357) @@ -9,6 +9,8 @@ with regard to C++. * Add patches/any/cvs-flush-cache-textrels.diff to fix random crashes on ARM, if the executable or shared library has TEXTREL. + * Add patches/any/cvs-__block.diff from upstream to not conflict with + clang. [ Samuel Thibault ] * patches/hurd-i386/local-pthread_posix-option.diff: Avoid letting glibc try @@ -18,7 +20,7 @@ * Add patches/hppa/cvs-vfork.diff to fix stack frame creating during vfork in multithreaded environments. - -- Aurelien Jarno <aure...@debian.org> Thu, 24 Jun 2010 19:40:20 +0200 + -- Aurelien Jarno <aure...@debian.org> Thu, 24 Jun 2010 20:23:26 +0200 eglibc (2.11.2-1) unstable; urgency=low Added: glibc-package/trunk/debian/patches/any/cvs-__block.diff =================================================================== --- glibc-package/trunk/debian/patches/any/cvs-__block.diff (rev 0) +++ glibc-package/trunk/debian/patches/any/cvs-__block.diff 2010-06-24 18:29:22 UTC (rev 4357) @@ -0,0 +1,36 @@ +2010-06-24 Mark Heily <m...@heily.com> + + * crypt/crypt.h, posix/unistd.h: Use __libc_block instead of + __block. + +--- a/crypt/crypt.h ++++ b/crypt/crypt.h +@@ -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 +--- a/posix/unistd.h ++++ b/posix/unistd.h +@@ -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 Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2010-06-24 17:41:11 UTC (rev 4356) +++ glibc-package/trunk/debian/patches/series 2010-06-24 18:29:22 UTC (rev 4357) @@ -248,3 +248,4 @@ any/submitted-group_member.diff any/cvs-redirect-throw.diff any/cvs-flush-cache-textrels.diff +any/cvs-__block.diff -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1orrb8-0007so...@alioth.debian.org