diff options
Diffstat (limited to 'archival')
-rw-r--r-- | archival/libunarchive/unxz/xz_config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h index a4141e136..187e1cbed 100644 --- a/archival/libunarchive/unxz/xz_config.h +++ b/archival/libunarchive/unxz/xz_config.h | |||
@@ -32,9 +32,9 @@ | |||
32 | #define memeq(a, b, size) (memcmp(a, b, size) == 0) | 32 | #define memeq(a, b, size) (memcmp(a, b, size) == 0) |
33 | #define memzero(buf, size) memset(buf, 0, size) | 33 | #define memzero(buf, size) memset(buf, 0, size) |
34 | 34 | ||
35 | #ifndef min | 35 | #undef min |
36 | #undef min_t | ||
36 | #define min(x, y) ((x) < (y) ? (x) : (y)) | 37 | #define min(x, y) ((x) < (y) ? (x) : (y)) |
37 | #endif | ||
38 | #define min_t(type, x, y) min(x, y) | 38 | #define min_t(type, x, y) min(x, y) |
39 | 39 | ||
40 | /* | 40 | /* |