Author: ps-guest Date: 2013-10-13 10:42:44 +0000 (Sun, 13 Oct 2013) New Revision: 5723
Added: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff Modified: glibc-package/branches/eglibc-2.18/debian/changelog glibc-package/branches/eglibc-2.18/debian/patches/series Log: add kfreebsd/submitted-waitid.diff Modified: glibc-package/branches/eglibc-2.18/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-13 10:30:15 UTC (rev 5722) +++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-13 10:42:44 UTC (rev 5723) @@ -64,6 +64,7 @@ * kfreebsd/local-sysdeps.diff: update to revision xxxx (from glibc-bsd). * kfreebsd/local-fbtl.diff: likewise * update symbols file for kfreebsd + * add kfreebsd/submitted-waitid.diff -- Adam Conrad <adcon...@ubuntu.com> Sun, 25 Aug 2013 14:59:44 -0600 Added: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff (rev 0) +++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/submitted-waitid.diff 2013-10-13 10:42:44 UTC (rev 5723) @@ -0,0 +1,70 @@ + + +http://sourceware.org/bugzilla/show_bug.cgi?id=15544 + + + +diff --git a/bits/waitflags.h b/bits/waitflags.h +index 59215f6..73fd714 100644 +--- a/bits/waitflags.h ++++ b/bits/waitflags.h +@@ -24,3 +24,16 @@ + /* Bits in the third argument to `waitpid'. */ + #define WNOHANG 1 /* Don't block waiting. */ + #define WUNTRACED 2 /* Report status of stopped children. */ ++ ++/* The following values are used by the `waitid' function. */ ++#if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8 ++# ifndef __ENUM_IDTYPE_T ++# define __ENUM_IDTYPE_T 1 ++typedef enum ++{ ++ P_ALL, /* Wait for any child. */ ++ P_PID, /* Wait for specified process. */ ++ P_PGID /* Wait for members of process group. */ ++} idtype_t; ++# endif ++#endif +diff --git a/posix/sys/wait.h b/posix/sys/wait.h +index 3ecc493..5692b07 100644 +--- a/posix/sys/wait.h ++++ b/posix/sys/wait.h +@@ -94,17 +94,6 @@ typedef union + # define W_STOPCODE(sig) __W_STOPCODE (sig) + #endif + +-/* The following values are used by the `waitid' function. */ +-#if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8 +-typedef enum +-{ +- P_ALL, /* Wait for any child. */ +- P_PID, /* Wait for specified process. */ +- P_PGID /* Wait for members of process group. */ +-} idtype_t; +-#endif +- +- + /* Wait for a child to die. When one does, put its status in *STAT_LOC + and return its process ID. For errors, return (pid_t) -1. + +diff --git a/sysdeps/unix/sysv/linux/bits/waitflags.h b/sysdeps/unix/sysv/linux/bits/waitflags.h +index 2be017d..2ede21b 100644 +--- a/sysdeps/unix/sysv/linux/bits/waitflags.h ++++ b/sysdeps/unix/sysv/linux/bits/waitflags.h +@@ -35,3 +35,16 @@ + in this group */ + #define __WALL 0x40000000 /* Wait for any child. */ + #define __WCLONE 0x80000000 /* Wait for cloned process. */ ++ ++/* The following values are used by the `waitid' function. */ ++#if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8 ++# ifndef __ENUM_IDTYPE_T ++# define __ENUM_IDTYPE_T 1 ++typedef enum ++{ ++ P_ALL, /* Wait for any child. */ ++ P_PID, /* Wait for specified process. */ ++ P_PGID /* Wait for members of process group. */ ++} idtype_t; ++# endif ++#endif Modified: glibc-package/branches/eglibc-2.18/debian/patches/series =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-13 10:30:15 UTC (rev 5722) +++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-13 10:42:44 UTC (rev 5723) @@ -142,6 +142,7 @@ ia64/submitted-remainder.diff kfreebsd/submitted-libc_once.diff +kfreebsd/submitted-waitid.diff kfreebsd/local-config_h_in.patch kfreebsd/local-grantpt.diff kfreebsd/local-sysdeps.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/e1vvj8g-0000u0...@vasks.debian.org