aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2010-06-18 22:37:42 -0700
committerDenys Vlasenko <vda.linux@googlemail.com>2010-06-19 20:03:15 +0200
commitfdd7b566ecdc174907f38d9389b28ba842d2b4bf (patch)
tree38e5f9a61da8c6ed5155d3542fd0d56aaf157714 /archival
parenteb08b6ed5cc7bb764658cd7a3b829e2b3aac4abc (diff)
downloadbusybox-fdd7b566ecdc174907f38d9389b28ba842d2b4bf.tar.gz
A few minor portability improvements
Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/libunarchive/unxz/xz_config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h
index ff90eff26..a4141e136 100644
--- 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)
/*