r3993 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-11-19 19:19:03 +0000 (Thu, 19 Nov 2009)
New Revision: 3993
Added:
glibc-package/trunk/debian/patches/any/cvs-sched_h.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-sched_h.2.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Replace patches/any/submitted-sched_h.2.diff by upstream version
patches/any/cvs-sched_h.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-19 16:16:24 UTC (rev 3992)
+++ glibc-package/trunk/debian/changelog 2009-11-19 19:19:03 UTC (rev 3993)
@@ -19,7 +19,9 @@
objects. Closes: #556951.
* patches/any/submitted-bits-fcntl_h-at.diff: new patch to move AT_*
constants from <fcntl.h> to <bits/fcntl.h>.
-
+ * Replace patches/any/submitted-sched_h.2.diff by upstream version
+ patches/any/cvs-sched_h.diff.
+
[ Carlos O'Donell]
* patches/hppa/local-stack-grows-up.diff: new version.
Added: glibc-package/trunk/debian/patches/any/cvs-sched_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-sched_h.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-sched_h.diff 2009-11-19 19:19:03 UTC (rev 3993)
@@ -0,0 +1,49 @@
+2009-11-19 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10918]
+ * sysdeps/unix/sysv/linux/bits/sched.h (__CPU_ISSET_S): Use __const
+ in cast to not throw away const-ness of parameters.
+ (__CPU_EQUAL_S): Likewise.
+ (__CPU_OP_S): Likewise.
+
+--- a/sysdeps/unix/sysv/linux/bits/sched.h
++++ b/sysdeps/unix/sysv/linux/bits/sched.h
+@@ -1,6 +1,6 @@
+ /* Definitions of constants and data structure for POSIX 1003.1b-1993
+ scheduling interface.
+- Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008
++ Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+@@ -154,7 +154,7 @@ typedef struct
+ (__extension__ \
+ ({ size_t __cpu = (cpu); \
+ __cpu < 8 * (setsize) \
+- ? ((((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
++ ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
+ & __CPUMASK (__cpu))) != 0 \
+ : 0; }))
+
+@@ -167,8 +167,8 @@ typedef struct
+ # else
+ # define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
+ (__extension__ \
+- ({ __cpu_mask *__arr1 = (cpusetp1)->__bits; \
+- __cpu_mask *__arr2 = (cpusetp2)->__bits; \
++ ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits; \
++ __const __cpu_mask *__arr2 = (cpusetp2)->__bits; \
+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
+ size_t __i; \
+ for (__i = 0; __i < __imax; ++__i) \
+@@ -180,8 +180,8 @@ typedef struct
+ # define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
+ (__extension__ \
+ ({ cpu_set_t *__dest = (destset); \
+- __cpu_mask *__arr1 = (srcset1)->__bits; \
+- __cpu_mask *__arr2 = (srcset2)->__bits; \
++ __const __cpu_mask *__arr1 = (srcset1)->__bits; \
++ __const __cpu_mask *__arr2 = (srcset2)->__bits; \
+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
+ size_t __i; \
+ for (__i = 0; __i < __imax; ++__i) \
Deleted: glibc-package/trunk/debian/patches/any/submitted-sched_h.2.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-sched_h.2.diff 2009-11-19 16:16:24 UTC (rev 3992)
+++ glibc-package/trunk/debian/patches/any/submitted-sched_h.2.diff 2009-11-19 19:19:03 UTC (rev 3993)
@@ -1,18 +0,0 @@
-2009-11-08 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/bits/sched.h (__CPU_ISSET_S): allow
- const argument.
-
-diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h
-index 95d05b4..7cecb86 100644
---- a/sysdeps/unix/sysv/linux/bits/sched.h
-+++ b/sysdeps/unix/sysv/linux/bits/sched.h
-@@ -154,7 +154,7 @@ typedef struct
- (__extension__ \
- ({ size_t __cpu = (cpu); \
- __cpu < 8 * (setsize) \
-- ? ((((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
-+ ? ((((const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
- & __CPUMASK (__cpu))) != 0 \
- : 0; }))
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-11-19 16:16:24 UTC (rev 3992)
+++ glibc-package/trunk/debian/patches/series 2009-11-19 19:19:03 UTC (rev 3993)
@@ -208,8 +208,8 @@
any/submitted-localedef-mmap.diff
any/submitted-confname.h.diff
any/cvs-getutmpx-compat.diff
-any/submitted-sched_h.2.diff
all/local-ldd.diff
any/cvs-malloc-check.diff
any/cvs-ksm.diff
any/submitted-bits-fcntl_h-at.diff
+any/cvs-sched_h.diff
Reply to: