r3285 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-02-19 12:43:03 +0000 (Thu, 19 Feb 2009)
New Revision: 3285
Added:
glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/cvs-pthread_h.diff: patch from upstream to fix warning
in pthread.h.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-02-19 12:33:56 UTC (rev 3284)
+++ glibc-package/trunk/debian/changelog 2009-02-19 12:43:03 UTC (rev 3285)
@@ -5,12 +5,14 @@
machines using cpufreq.
* Rename submitted/cvs-tsd.diff into hppa/cvs-tsd.diff.
* patches/any/local-bashisms.diff: fix more bashisms in the testsuite.
+ * patches/any/cvs-pthread_h.diff: patch from upstream to fix warning
+ in pthread.h.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2368 (from glibc-bsd).
* drop kfreebsd/local-sysdeps28.diff (merged into local-sysdeps.diff).
- -- Aurelien Jarno <aurel32@debian.org> Thu, 19 Feb 2009 13:33:42 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 19 Feb 2009 13:41:10 +0100
glibc (2.9-1) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff 2009-02-19 12:43:03 UTC (rev 3285)
@@ -0,0 +1,30 @@
+commit a3e5efd845589c11f93935c0a0b13262b1e912b3
+Author: Ulrich Drepper <drepper@redhat.com>
+Date: Tue Dec 9 23:04:03 2008 +0000
+
+ (pthread_cleanup_pop): Use { } as empty loop body instead of ; to avoid gcc
+ warnings.
+ (pthread_cleanup_pop_restore_np): Likewise.
+
+diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
+index d5ffd38..cc7472e 100644
+--- a/nptl/sysdeps/pthread/pthread.h
++++ b/nptl/sysdeps/pthread/pthread.h
+@@ -655,7 +655,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
+ /* Remove a cleanup handler installed by the matching pthread_cleanup_push.
+ If EXECUTE is non-zero, the handler function is called. */
+ # define pthread_cleanup_pop(execute) \
+- do; while (0); /* Empty to allow label before pthread_cleanup_pop. */ \
++ do { } while (0);/* Empty to allow label before pthread_cleanup_pop. */\
+ } while (0); \
+ __pthread_unregister_cancel (&__cancel_buf); \
+ if (execute) \
+@@ -691,7 +691,7 @@ extern void __pthread_register_cancel_defer (__pthread_unwind_buf_t *__buf)
+ restores the cancellation type that was in effect when the matching
+ pthread_cleanup_push_defer was called. */
+ # define pthread_cleanup_pop_restore_np(execute) \
+- do; while (0); /* Empty to allow label before pthread_cleanup_pop. */ \
++ do { } while (0);/* Empty to allow label before pthread_cleanup_pop. */\
+ } while (0); \
+ __pthread_unregister_cancel_restore (&__cancel_buf); \
+ if (execute) \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-02-19 12:33:56 UTC (rev 3284)
+++ glibc-package/trunk/debian/patches/series 2009-02-19 12:43:03 UTC (rev 3285)
@@ -183,3 +183,4 @@
any/local-nss-overflow.diff
any/submitted-popen.diff
any/local-linuxthreads-thread_self.diff
+any/cvs-pthread_h.diff
Reply to: