diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-07 13:20:33 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-05-07 13:20:33 -0400 |
| commit | 95721191747f271812735c26f06c73887d02bdaf (patch) | |
| tree | 328fd67cdd25b12e3ea29a58061eb606722c75d4 | |
| parent | f87dfb1f11c01f2ccdc40d81e134cd06b32e28e8 (diff) | |
| download | glibc-95721191747f271812735c26f06c73887d02bdaf.tar.gz glibc-95721191747f271812735c26f06c73887d02bdaf.tar.xz glibc-95721191747f271812735c26f06c73887d02bdaf.zip | |
Actually undefine ARG_MAX from <linux/limits.h>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/param.h | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 76d790593a..f485c3ea8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-03-05 Jonathan Nieder <jrnieder@gmail.com> + + * sysdeps/unix/sysv/linux/sys/param.h: Fix an #ifndef __undef_ARG_MAX + where #ifdef was intended. The intent is to prevent ARG_MAX from + being defined by the kernel headers. + 2011-05-07 Ulrich Drepper <drepper@gmail.com> [BZ #12734] diff --git a/sysdeps/unix/sysv/linux/sys/param.h b/sysdeps/unix/sysv/linux/sys/param.h index 19c119a2c8..da8f5e4465 100644 --- a/sysdeps/unix/sysv/linux/sys/param.h +++ b/sysdeps/unix/sysv/linux/sys/param.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995-1997,2000,2001,2003,2008 Free Software Foundation, Inc. +/* Copyright (C) 1995-1997,2000,2001,2003,2008,2011 + 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 @@ -28,7 +29,7 @@ #include <linux/param.h> /* The kernel headers defines ARG_MAX. The value is wrong, though. */ -#ifndef __undef_ARG_MAX +#ifdef __undef_ARG_MAX # undef ARG_MAX # undef __undef_ARG_MAX #endif |