From ba729de6436ea0a8af3ad80f9555cf3161c7694b Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 29 Jan 2018 22:21:46 +0100 Subject: [PATCH] allocalim.h: Fix codestyle * sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of || to respect codestyle. --- ChangeLog | 2 ++ sysdeps/pthread/allocalim.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f601029ea..c86e6a23e8 100644 --- 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 diff --git a/sysdeps/pthread/allocalim.h b/sysdeps/pthread/allocalim.h index fdae0c251f..38faf57b70 100644 --- a/sysdeps/pthread/allocalim.h +++ b/sysdeps/pthread/allocalim.h @@ -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)); + ); }