]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
allocalim.h: Fix codestyle
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Mon, 29 Jan 2018 21:21:46 +0000 (22:21 +0100)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Mon, 29 Jan 2018 22:00:17 +0000 (23:00 +0100)
* sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of
|| to respect codestyle.

ChangeLog
sysdeps/pthread/allocalim.h

index 6f601029ea852f09dd28909e753b18e56c2e471e..c86e6a23e87818e458ffb6782a7d2eeda06c740e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
        * sysdeps/mach/hurd/i386/libresolv.abilist: New file.
        * sysdeps/mach/hurd/i386/librt.abilist: New file.
        * sysdeps/mach/hurd/i386/libutil.abilist: New file.
+       * sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of
+       || to respect codestyle.
 
 2018-01-29  Darius Rad  <darius@bluespec.com>
 
index fdae0c251f70b25b6104e3c837a56fbd630c8322..38faf57b70a38e425426042ec40519eebf6652ee 100644 (file)
@@ -24,9 +24,9 @@ extern __always_inline
 int
 __libc_use_alloca (size_t size)
 {
-  return (
+  return (__builtin_expect (__libc_alloca_cutoff (size), 1)
 #ifdef PTHREAD_STACK_MIN
-          __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) ||
+          || __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1)
 #endif
-          __builtin_expect (__libc_alloca_cutoff (size), 1));
+         );
 }