diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-04-02 11:55:20 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-04-02 11:55:20 +0000 |
| commit | 7c5d4001fb94aa2027530f79ac48918b15361a2b (patch) | |
| tree | 2d07b83882bbb915c9c2e8f0f9097ee9f435b5fe /libc/nptl/sysdeps/unix | |
| parent | b3f36e492255400533794538574910135da10b92 (diff) | |
| download | eglibc2-7c5d4001fb94aa2027530f79ac48918b15361a2b.tar.gz | |
Merge changes between r5678 and r5759 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@5760 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl/sysdeps/unix')
5 files changed, 46 insertions, 5 deletions
diff --git a/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h b/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h index 9b27b1ff4..a7c9740a0 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h +++ b/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h @@ -1,5 +1,5 @@ /* Minimum guaranteed maximum values for system limits. Linux/Alpha version. - Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. + Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,6 +31,9 @@ #ifndef OPEN_MAX # define __undef_OPEN_MAX #endif +#ifndef ARG_MAX +# define __undef_ARG_MAX +#endif /* The kernel sources contain a file with all the needed information. */ #include <linux/limits.h> @@ -50,6 +53,11 @@ # undef OPEN_MAX # undef __undef_OPEN_MAX #endif +/* Have to remove ARG_MAX? */ +#ifdef __undef_ARG_MAX +# undef ARG_MAX +# undef __undef_ARG_MAX +#endif /* The number of data keys per process. */ #define _POSIX_THREAD_KEYS_MAX 128 diff --git a/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h b/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h index 4b7b29787..8f0df4f92 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h +++ b/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h @@ -1,5 +1,5 @@ /* Minimum guaranteed maximum values for system limits. Linux version. - Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. + Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,6 +31,9 @@ #ifndef OPEN_MAX # define __undef_OPEN_MAX #endif +#ifndef ARG_MAX +# define __undef_ARG_MAX +#endif /* The kernel sources contain a file with all the needed information. */ #include <linux/limits.h> @@ -50,6 +53,11 @@ # undef OPEN_MAX # undef __undef_OPEN_MAX #endif +/* Have to remove ARG_MAX? */ +#ifdef __undef_ARG_MAX +# undef ARG_MAX +# undef __undef_ARG_MAX +#endif /* The number of data keys per process. */ #define _POSIX_THREAD_KEYS_MAX 128 diff --git a/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h b/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h index 83db31efc..4b8a03504 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h +++ b/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h @@ -1,5 +1,5 @@ /* Minimum guaranteed maximum values for system limits. Linux/IA-64 version. - Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. + Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,6 +31,9 @@ #ifndef OPEN_MAX # define __undef_OPEN_MAX #endif +#ifndef ARG_MAX +# define __undef_ARG_MAX +#endif /* The kernel sources contain a file with all the needed information. */ #include <linux/limits.h> @@ -50,6 +53,11 @@ # undef OPEN_MAX # undef __undef_OPEN_MAX #endif +/* Have to remove ARG_MAX? */ +#ifdef __undef_ARG_MAX +# undef ARG_MAX +# undef __undef_ARG_MAX +#endif /* The number of data keys per process. */ #define _POSIX_THREAD_KEYS_MAX 128 diff --git a/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h b/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h index 02e2d1734..8b836a989 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h +++ b/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h @@ -1,5 +1,6 @@ /* Minimum guaranteed maximum values for system limits. Linux/PPC version. - Copyright (C) 1993-1998,2000,2002-2004,2006 Free Software Foundation, Inc. + Copyright (C) 1993-1998,2000,2002-2004,2006,2008 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,6 +32,9 @@ #ifndef OPEN_MAX # define __undef_OPEN_MAX #endif +#ifndef ARG_MAX +# define __undef_ARG_MAX +#endif /* The kernel sources contain a file with all the needed information. */ #include <linux/limits.h> @@ -50,6 +54,11 @@ # undef OPEN_MAX # undef __undef_OPEN_MAX #endif +/* Have to remove ARG_MAX? */ +#ifdef __undef_ARG_MAX +# undef ARG_MAX +# undef __undef_ARG_MAX +#endif /* The number of data keys per process. */ #define _POSIX_THREAD_KEYS_MAX 128 diff --git a/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h b/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h index 2576f121c..6e356031d 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h +++ b/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h @@ -1,5 +1,5 @@ /* Minimum guaranteed maximum values for system limits. Linux/SPARC version. - Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. + Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,6 +31,9 @@ #ifndef OPEN_MAX # define __undef_OPEN_MAX #endif +#ifndef ARG_MAX +# define __undef_ARG_MAX +#endif /* The kernel sources contain a file with all the needed information. */ #include <linux/limits.h> @@ -50,6 +53,11 @@ # undef OPEN_MAX # undef __undef_OPEN_MAX #endif +/* Have to remove ARG_MAX? */ +#ifdef __undef_ARG_MAX +# undef ARG_MAX +# undef __undef_ARG_MAX +#endif /* The number of data keys per process. */ #define _POSIX_THREAD_KEYS_MAX 128 |