diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-31 00:17:03 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-31 01:49:05 +0400 |
| commit | 49e036767038c6e596757c028fef3fff6ebebfb1 (patch) | |
| tree | 3a3d6d72e8e4ff39b38922e7d92e22a67cb405ba /sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sys/sysmacros.h | |
| parent | 17255e6a6b705ddb5bdcaa59acefca48f2aef088 (diff) | |
| download | glibc-49e036767038c6e596757c028fef3fff6ebebfb1.tar.gz | |
Fixed possible roundup and howmany macros collision
Diffstat (limited to 'sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sys/sysmacros.h')
| -rw-r--r-- | sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sys/sysmacros.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sys/sysmacros.h b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sys/sysmacros.h index 74095a247c..7cda290acd 100644 --- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sys/sysmacros.h +++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sys/sysmacros.h @@ -70,8 +70,13 @@ # define expdev(x) (dev_t)(((dev_t)(((x) >> O_BITSMINOR) & O_MAXMAJ) << \ L_BITSMINOR) | ((x) & O_MAXMIN)) -# define howmany(x, y) (((x)+((y)-1))/(y)) -# define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) +# ifndef howmany +# define howmany(x, y) (((x)+((y)-1))/(y)) +# endif + +# ifndef roundup +# define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) +# endif # define IS_P2ALIGNED(v, a) ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0) # define ISP2(x) (((x) & ((x) - 1)) == 0) |