A few minor portability improvements

Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2010-06-18 22:37:42 -07:00
parent eb08b6ed5c
commit fdd7b566ec
5 changed files with 8 additions and 5 deletions
--- a/archival/libunarchive/unxz/xz_config.h
+++ b/archival/libunarchive/unxz/xz_config.h
@@ -32,7 +32,9 @@
 #define memeq(a, b, size) (memcmp(a, b, size) == 0)
 #define memzero(buf, size) memset(buf, 0, size)

+#ifndef min
 #define min(x, y) ((x) < (y) ? (x) : (y))
+#endif
 #define min_t(type, x, y) min(x, y)

 /*