Skip to content

Commit

Permalink
Actually undefine ARG_MAX from <linux/limits.h>
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Nieder authored and Ulrich Drepper committed May 7, 2011
1 parent f87dfb1 commit 9572119
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
5 changes: 3 additions & 2 deletions sysdeps/unix/sysv/linux/sys/param.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9572119

Please sign in to comment.