2002-11-21 22:24:14

by Bob Miller

[permalink] [raw]
Subject: [TRIVIAL PATCH 2.5.48] Use min_t() instead of min() in fs/xfs/support/qsort.c


This change removes a "duplicate 'const'" compiler warning.

diff -Nru a/fs/xfs/support/qsort.c b/fs/xfs/support/qsort.c
--- a/fs/xfs/support/qsort.c Thu Nov 21 13:51:26 2002
+++ b/fs/xfs/support/qsort.c Thu Nov 21 13:51:26 2002
@@ -199,7 +199,7 @@
{
char *const end_ptr = &base_ptr[size * (total_elems - 1)];
char *tmp_ptr = base_ptr;
- char *thresh = min(end_ptr, base_ptr + max_thresh);
+ char *thresh = min_t(const int, end_ptr, base_ptr + max_thresh);
register char *run_ptr;

/* Find smallest element in first threshold and place it at the
--
Bob Miller Email: [email protected]
Open Source Development Lab Phone: 503.626.2455 Ext. 17