diff options
| author | Karel Zak | 2010-03-16 15:24:04 +0100 |
|---|---|---|
| committer | Karel Zak | 2010-03-16 15:24:04 +0100 |
| commit | 70502c5246815c35dba4d062ef4152d71b827ef8 (patch) | |
| tree | d0655b68fa2f3b30d55fc5124a3dbd8fa39533d4 /include/c.h | |
| parent | cal: factor out and update multibyte alignment code (diff) | |
| download | kernel-qcow2-util-linux-70502c5246815c35dba4d062ef4152d71b827ef8.tar.gz kernel-qcow2-util-linux-70502c5246815c35dba4d062ef4152d71b827ef8.tar.xz kernel-qcow2-util-linux-70502c5246815c35dba4d062ef4152d71b827ef8.zip | |
lib: add #ifndef around min() max() macros
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'include/c.h')
| -rw-r--r-- | include/c.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/c.h b/include/c.h index 6615f6fea..577b8a809 100644 --- a/include/c.h +++ b/include/c.h @@ -46,17 +46,20 @@ # define FALSE 0 #endif - -#define min(x, y) ({ \ +#ifndef min +# define min(x, y) ({ \ typeof(x) _min1 = (x); \ typeof(y) _min2 = (y); \ (void) (&_min1 == &_min2); \ _min1 < _min2 ? _min1 : _min2; }) +#endif -#define max(x, y) ({ \ +#ifndef max +# define max(x, y) ({ \ typeof(x) _max1 = (x); \ typeof(y) _max2 = (y); \ (void) (&_max1 == &_max2); \ _max1 > _max2 ? _max1 : _max2; }) +#endif #endif /* UTIL_LINUX_C_H */ |