From 920a69a8d8e4203c5edddd829d932130eac188ea Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Wed, 26 May 2010 10:36:46 +0300 Subject: Rename MIN() and MAX() to my_min() and my_max(). This should avoid some minor portability issues. --- src/liblzma/lz/lz_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/liblzma/lz/lz_encoder.c') diff --git a/src/liblzma/lz/lz_encoder.c b/src/liblzma/lz/lz_encoder.c index 757e5374..691fe72d 100644 --- a/src/liblzma/lz/lz_encoder.c +++ b/src/liblzma/lz/lz_encoder.c @@ -423,7 +423,7 @@ lz_encoder_init(lzma_mf *mf, lzma_allocator *allocator, && lz_options->preset_dict_size > 0) { // If the preset dictionary is bigger than the actual // dictionary, use only the tail. - mf->write_pos = MIN(lz_options->preset_dict_size, mf->size); + mf->write_pos = my_min(lz_options->preset_dict_size, mf->size); memcpy(mf->buffer, lz_options->preset_dict + lz_options->preset_dict_size - mf->write_pos, mf->write_pos); -- cgit v1.2.3