| commit | f8e569c87d4487631179210cf6c4f2d2a2cb007f | [log] [tgz] |
|---|---|---|
| author | Lasse Collin <[email protected]> | Tue Jun 22 12:53:11 2010 +0300 |
| committer | Lasse Collin <[email protected]> | Tue Jun 22 12:53:11 2010 +0300 |
| tree | 65ddb98cb27c612f61a1b900df51149da8a01742 | |
| parent | 578f2a6a239d1eaa2dabc7e951b3db0cbf53d226 [diff] [blame] |
Add "#ifndef min" to xz_config.h.
diff --git a/userspace/xz_config.h b/userspace/xz_config.h index ff90eff..9d714f3 100644 --- a/userspace/xz_config.h +++ b/userspace/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) -#define min(x, y) ((x) < (y) ? (x) : (y)) +#ifndef min +# define min(x, y) ((x) < (y) ? (x) : (y)) +#endif #define min_t(type, x, y) min(x, y) /*