← Back to branch summary

~ubuntu-branches/ubuntu/precise/eglibc/precise

« back to all changes in this revision

Viewing changes to debian/patches/any/cvs-sys-param-ARG_MAX.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-10-04 17:48:26 UTC
  • mfrom: (216.1.23 oneiric)
  • Revision ID: package-import@ubuntu.com-20111004174826-2cyb9ewn3ucymlsx
Tags: 2.13-20ubuntu5
https://launchpad.net/bugs/853688
libc6-dev: Don't break the current {gnat,gcj}-4.4-base versons. LP: #853688.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/any/cvs-sys-param-ARG_MAX.diff
 
1
2011-03-05  Jonathan Nieder  <jrnieder@gmail.com>
 
2
 
 
3
        * sysdeps/unix/sysv/linux/sys/param.h: Fix an #ifndef __undef_ARG_MAX
 
4
        where #ifdef was intended.  The intent is to prevent ARG_MAX from
 
5
        being defined by the kernel headers.
 
6
 
 
7
diff --git a/sysdeps/unix/sysv/linux/sys/param.h b/sysdeps/unix/sysv/linux/sys/param.h
 
8
index 19c119a..da8f5e4 100644
 
9
--- a/sysdeps/unix/sysv/linux/sys/param.h
 
10
+++ b/sysdeps/unix/sysv/linux/sys/param.h
 
11
@@ -1,4 +1,5 @@
 
12
-/* Copyright (C) 1995-1997,2000,2001,2003,2008 Free Software Foundation, Inc.
 
13
+/* Copyright (C) 1995-1997,2000,2001,2003,2008,2011
 
14
+   Free Software Foundation, Inc.
 
15
    This file is part of the GNU C Library.
 
16
 
 
17
    The GNU C Library is free software; you can redistribute it and/or
 
18
@@ -28,7 +29,7 @@
 
19
 #include <linux/param.h>
 
20
 
 
21
 /* The kernel headers defines ARG_MAX.  The value is wrong, though.  */
 
22
-#ifndef __undef_ARG_MAX
 
23
+#ifdef __undef_ARG_MAX
 
24
 # undef ARG_MAX
 
25
 # undef __undef_ARG_MAX
 
26
 #endif