summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-djw.h
diff options
context:
space:
mode:
Diffstat (limited to 'xdelta3/xdelta3-djw.h')
-rw-r--r--xdelta3/xdelta3-djw.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/xdelta3/xdelta3-djw.h b/xdelta3/xdelta3-djw.h
index 422e06a..080de59 100644
--- a/xdelta3/xdelta3-djw.h
+++ b/xdelta3/xdelta3-djw.h
@@ -456,7 +456,7 @@ djw_build_prefix (const djw_weight *freq, uint8_t *clen, usize_t asize, usize_t
456 djw_heapen *h2 = heap_extract (heap, ents, --heap_last); 456 djw_heapen *h2 = heap_extract (heap, ents, --heap_last);
457 457
458 ents[ents_size].freq = h1->freq + h2->freq; 458 ents[ents_size].freq = h1->freq + h2->freq;
459 ents[ents_size].depth = 1 + max (h1->depth, h2->depth); 459 ents[ents_size].depth = 1 + xd3_max (h1->depth, h2->depth);
460 ents[ents_size].parent = 0; 460 ents[ents_size].parent = 0;
461 461
462 h1->parent = h2->parent = ents_size; 462 h1->parent = h2->parent = ents_size;
@@ -525,7 +525,7 @@ djw_build_codes (usize_t *codes, const uint8_t *clen, usize_t asize, usize_t abs
525 min_clen = clen[i]; 525 min_clen = clen[i];
526 } 526 }
527 527
528 max_clen = max (max_clen, (usize_t) clen[i]); 528 max_clen = xd3_max (max_clen, (usize_t) clen[i]);
529 } 529 }
530 530
531 XD3_ASSERT (max_clen <= abs_max); 531 XD3_ASSERT (max_clen <= abs_max);
@@ -1799,7 +1799,7 @@ xd3_decode_huff (xd3_stream *stream,
1799 XD3_ASSERT (output_end - output > 0); 1799 XD3_ASSERT (output_end - output > 0);
1800 1800
1801 /* Decode next sector. */ 1801 /* Decode next sector. */
1802 n = min (sector_size, (usize_t) (output_end - output)); 1802 n = xd3_min (sector_size, (usize_t) (output_end - output));
1803 1803
1804 do 1804 do
1805 { 1805 {