diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-06-07 14:59:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-06-07 14:59:44 +0000 |
| commit | ee22bd62979d110d9ca44b3388273717b3454f87 (patch) | |
| tree | 3b9c7c765ad94821b4546bf6203408b50999aaee /include/sys/param.h | |
| parent | ef2a1844bb33649359b8a3ac6b94138fa6112bf1 (diff) | |
sync with glibc
Diffstat (limited to 'include/sys/param.h')
| -rw-r--r-- | include/sys/param.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/sys/param.h b/include/sys/param.h index d64f4b9a9..0b0424eb9 100644 --- a/include/sys/param.h +++ b/include/sys/param.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,2000,2001,2003 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 @@ -49,10 +49,16 @@ /* Macros for counting and rounding. */ #ifndef howmany -# define howmany(x, y) (((x)+((y)-1))/(y)) +# define howmany(x, y) (((x) + ((y) - 1)) / (y)) #endif -#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) -#define powerof2(x) ((((x)-1)&(x))==0) +#ifdef __GNUC__ +# define roundup(x, y) (__builtin_constant_p (y) && powerof2 (y) \ + ? (((x) + (y) - 1) & ~((y) - 1)) \ + : ((((x) + ((y) - 1)) / (y)) * (y))) +#else +# define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) +#endif +#define powerof2(x) ((((x) - 1) & (x)) == 0) /* Macros for min/max. */ #define MIN(a,b) (((a)<(b))?(a):(b)) |