diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:19:59 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:19:59 -0600 |
| commit | f2e499dd8395843c89d15c185ec8a92f6bb07ad5 (patch) | |
| tree | 4dac54be9337aae07aeb7cba1e5d8a89ba581d93 /fs | |
| parent | 67576a2a0840122efe76641fa84a1ec84b87043c (diff) | |
Bugzilla 511: Redefine the min macro #defined in yaffs_qsort to yaffs_min
so that it doesn't conflict with the macro defined in linux/kernel.h.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-yaffs2_define_min_fix.patch
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/yaffs2/yaffs_qsort.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/yaffs2/yaffs_qsort.c b/fs/yaffs2/yaffs_qsort.c index 296701d2e41f..ea718985754b 100644 --- a/fs/yaffs2/yaffs_qsort.c +++ b/fs/yaffs2/yaffs_qsort.c @@ -74,7 +74,7 @@ med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *)) :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c )); } -#define min(a,b) (((a) < (b)) ? (a) : (b)) +#define yaffs_min(a,b) (((a) < (b)) ? (a) : (b)) void qsort(void *aa, size_t n, size_t es, int (*cmp)(const void *, const void *)) { @@ -140,9 +140,9 @@ loop: SWAPINIT(a, es); } pn = (char *)a + n * es; - r = min(pa - (char *)a, pb - pa); + r = yaffs_min(pa - (char *)a, pb - pa); vecswap(a, pb - r, r); - r = min((long)(pd - pc), (long)(pn - pd - es)); + r = yaffs_min((long)(pd - pc), (long)(pn - pd - es)); vecswap(pb, pn - r, r); if ((r = pb - pa) > es) qsort(a, r / es, es, cmp); |