r4412 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2010-09-02 01:58:45 +0000 (Thu, 02 Sep 2010)
New Revision: 4412
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-sched_param.diff
Removed:
glibc-package/trunk/debian/patches/hurd-i386/submitted-sched_param.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* mv patches/hurd-i386/{submitted,cvs}-sched_param.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-09-01 23:06:20 UTC (rev 4411)
+++ glibc-package/trunk/debian/changelog 2010-09-02 01:58:45 UTC (rev 4412)
@@ -1,3 +1,10 @@
+eglibc (2.11.2-5) unreleased; urgency=low
+
+ [ Samuel Thibault ]
+ * mv patches/hurd-i386/{submitted,cvs}-sched_param.diff.
+
+ -- Samuel Thibault <sthibault@debian.org> Thu, 02 Sep 2010 03:57:04 +0200
+
eglibc (2.11.2-4) unstable; urgency=low
[ Samuel Thibault ]
Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-sched_param.diff (from rev 4411, glibc-package/trunk/debian/patches/hurd-i386/submitted-sched_param.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-sched_param.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-sched_param.diff 2010-09-02 01:58:45 UTC (rev 4412)
@@ -0,0 +1,51 @@
+2010-09-01 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ This aligns bits/sched.h onto sysdeps/unix/sysv/linux/bits/sched.h:
+ define __sched_param instead of SCHED_* and sched_param when
+ <bits/sched.h> is included with __need_schedparam defined.
+
+ * bits/sched.h [__need_schedparam] (SCHED_OTHER, SCHED_FIFO, SCHED_RR,
+ sched_param): do not define.
+
+ [!__defined_schedparam && (__need_schedparam || _SCHED_H)]
+ (__defined_schedparam): Define to 1.
+ (__sched_param): New structure, identical to sched_param.
+ (__need_schedparam): Undefine.
+
+---
+ sched.h | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/bits/sched.h b/bits/sched.h
+index af92dbc..a068e50 100644
+--- a/bits/sched.h
++++ b/bits/sched.h
+@@ -18,6 +18,8 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#ifndef __need_schedparam
++
+ #ifndef _SCHED_H
+ # error "Never include <bits/sched.h> directly; use <sched.h> instead."
+ #endif
+@@ -34,6 +36,19 @@ struct sched_param
+ int __sched_priority;
+ };
+
++#endif /* need schedparam */
++
++#if !defined __defined_schedparam \
++ && (defined __need_schedparam || defined _SCHED_H)
++# define __defined_schedparam 1
++/* Data structure to describe a process' schedulability. */
++struct __sched_param
++ {
++ int __sched_priority;
++ };
++# undef __need_schedparam
++#endif
++
+
+ #if defined _SCHED_H && !defined __cpu_set_t_defined
+ # define __cpu_set_t_defined
Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-sched_param.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-sched_param.diff 2010-09-01 23:06:20 UTC (rev 4411)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-sched_param.diff 2010-09-02 01:58:45 UTC (rev 4412)
@@ -1,51 +0,0 @@
-2010-09-01 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- This aligns bits/sched.h onto sysdeps/unix/sysv/linux/bits/sched.h:
- define __sched_param instead of SCHED_* and sched_param when
- <bits/sched.h> is included with __need_schedparam defined.
-
- * bits/sched.h [__need_schedparam] (SCHED_OTHER, SCHED_FIFO, SCHED_RR,
- sched_param): do not define.
-
- [!__defined_schedparam && (__need_schedparam || _SCHED_H)]
- (__defined_schedparam): Define to 1.
- (__sched_param): New structure, identical to sched_param.
- (__need_schedparam): Undefine.
-
----
- sched.h | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/bits/sched.h b/bits/sched.h
-index af92dbc..a068e50 100644
---- a/bits/sched.h
-+++ b/bits/sched.h
-@@ -18,6 +18,8 @@
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-+#ifndef __need_schedparam
-+
- #ifndef _SCHED_H
- # error "Never include <bits/sched.h> directly; use <sched.h> instead."
- #endif
-@@ -34,6 +36,19 @@ struct sched_param
- int __sched_priority;
- };
-
-+#endif /* need schedparam */
-+
-+#if !defined __defined_schedparam \
-+ && (defined __need_schedparam || defined _SCHED_H)
-+# define __defined_schedparam 1
-+/* Data structure to describe a process' schedulability. */
-+struct __sched_param
-+ {
-+ int __sched_priority;
-+ };
-+# undef __need_schedparam
-+#endif
-+
-
- #if defined _SCHED_H && !defined __cpu_set_t_defined
- # define __cpu_set_t_defined
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-09-01 23:06:20 UTC (rev 4411)
+++ glibc-package/trunk/debian/patches/series 2010-09-02 01:58:45 UTC (rev 4412)
@@ -131,7 +131,7 @@
hurd-i386/cvs-select.diff
hurd-i386/local-i686.diff
hurd-i386/local-no-hp-timing.diff
-hurd-i386/submitted-sched_param.diff
+hurd-i386/cvs-sched_param.diff
ia64/local-dlfptr.diff
ia64/submitted-sysconf.diff
Reply to: