r5910 - in glibc-package/branches/eglibc-2.18/debian: . patches/kfreebsd
Author: adconrad
Date: 2014-01-10 23:02:43 +0000 (Fri, 10 Jan 2014)
New Revision: 5910
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff
Log:
debian/patches/kfreebsd/submitted-waitid.diff: On Linux, we must undef
waitflags before we define them or we'll conflict with kernel headers.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-10 22:29:48 UTC (rev 5909)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-10 23:02:43 UTC (rev 5910)
@@ -19,6 +19,8 @@
* debian/rules.d/build.mk, debian/sysdeps/{hurd,linux,kfreebsd}.mk: Make
pt_chown keyed off a new variable that we can use to enable or disable
it per kernel type rather than just the primary libc (Closes: #734607)
+ * debian/patches/kfreebsd/submitted-waitid.diff: On Linux, we must undef
+ waitflags before we define them or we'll conflict with kernel headers.
[ Aurelien Jarno ]
* debian/patches/any/cvs-vfscanf-0e+0.diff: new patch from upstream to
Modified: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff 2014-01-10 22:29:48 UTC (rev 5909)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff 2014-01-10 23:02:43 UTC (rev 5910)
@@ -51,7 +51,7 @@
index 2be017d..2ede21b 100644
--- a/sysdeps/unix/sysv/linux/bits/waitflags.h
+++ b/sysdeps/unix/sysv/linux/bits/waitflags.h
-@@ -35,3 +35,16 @@
+@@ -35,3 +35,23 @@
in this group */
#define __WALL 0x40000000 /* Wait for any child. */
#define __WCLONE 0x80000000 /* Wait for cloned process. */
@@ -60,6 +60,13 @@
+#if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8
+# ifndef __ENUM_IDTYPE_T
+# define __ENUM_IDTYPE_T 1
++
++/* The Linux kernel defines these bare, rather than an enum,
++ which causes a conflict if the include order is reversed. */
++# undef P_ALL
++# undef P_PID
++# undef P_PGID
++
+typedef enum
+{
+ P_ALL, /* Wait for any child. */
Reply to: