olga / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone

Blame SOURCES/glibc-rh1505492-undef-sysconf.patch

25845f
Fix -Wundef warning.  Upstream removed the __ASSUME_ARG_MAX_STACK_BASE
25845f
preprocessor conditional as part of this commit:
25845f
25845f
commit 637461d96563f3b7405df5b124ccfe843e537374
25845f
Author: Joseph Myers <joseph@codesourcery.com>
25845f
Date:   Mon May 12 22:48:25 2014 +0000
25845f
25845f
    Clean up kernel version conditionals for pre-2.6.32 kernels.
25845f
    
25845f
    This patch does some initial cleanup, following the move to 2.6.32
25845f
    minimum kernel version, by removing __LINUX_KERNEL_VERSION
25845f
    conditionals that are now always-true or always-false.  In the case of
25845f
    __ASSUME_ARG_MAX_STACK_BASED, where the conditional used a kernel
25845f
    version that was itself in a macro, the associated sysconf.c code is
25845f
    also cleaned up and __ASSUME_ARG_MAX_STACK_BASED removed completely.
25845f
25845f
diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c
25845f
index 47ce5ef07cce7888..05cbb0879e9748d5 100644
25845f
--- a/sysdeps/unix/sysv/linux/sysconf.c
25845f
+++ b/sysdeps/unix/sysv/linux/sysconf.c
25845f
@@ -88,7 +88,7 @@ __sysconf (int name)
25845f
       return HAS_CPUCLOCK (name);
25845f
 
25845f
     case _SC_ARG_MAX:
25845f
-#if !__ASSUME_ARG_MAX_STACK_BASED
25845f
+#ifndef __ASSUME_ARG_MAX_STACK_BASED
25845f
       /* Determine whether this is a kernel with an argument limit
25845f
 	 determined by the stack size.  */
25845f
       if (GLRO(dl_discover_osversion) ()