summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko2010-06-19 20:07:23 +0200
committerDenys Vlasenko2010-06-19 20:07:23 +0200
commit134d0eb114ac67693eb62bb030dd537eca71c48d (patch)
tree4241093db43409bfda1e9f8c6a91949a7de551ef /archival
parentebeac1685a6230abcf73ca36755e3bb208bfd569 (diff)
downloadbusybox-134d0eb114ac67693eb62bb030dd537eca71c48d.zip
busybox-134d0eb114ac67693eb62bb030dd537eca71c48d.tar.gz
cosmetics on top of Dan's patches
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/libunarchive/unxz/xz_config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h
index a4141e1..187e1cb 100644
--- a/archival/libunarchive/unxz/xz_config.h
+++ b/archival/libunarchive/unxz/xz_config.h
@@ -32,9 +32,9 @@
#define memeq(a, b, size) (memcmp(a, b, size) == 0)
#define memzero(buf, size) memset(buf, 0, size)
-#ifndef min
+#undef min
+#undef min_t
#define min(x, y) ((x) < (y) ? (x) : (y))
-#endif
#define min_t(type, x, y) min(x, y)
/*