diff options
Diffstat (limited to 'strings/ctype-mb.c')
| -rw-r--r-- | strings/ctype-mb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 5879bdf7978..5efc6348516 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -473,7 +473,7 @@ my_strnncoll_mb_bin(CHARSET_INFO * cs __attribute__((unused)), const uchar *t, size_t tlen, my_bool t_is_prefix) { - size_t len=min(slen,tlen); + size_t len=MY_MIN(slen,tlen); int cmp= memcmp(s,t,len); return cmp ? cmp : (int) ((t_is_prefix ? len : slen) - tlen); } @@ -518,7 +518,7 @@ my_strnncollsp_mb_bin(CHARSET_INFO * cs __attribute__((unused)), diff_if_only_endspace_difference= 0; #endif - end= a + (length= min(a_length, b_length)); + end= a + (length= MY_MIN(a_length, b_length)); while (a < end) { if (*a++ != *b++) @@ -557,7 +557,7 @@ static size_t my_strnxfrm_mb_bin(CHARSET_INFO *cs __attribute__((unused)), const uchar *src, size_t srclen) { if (dest != src) - memcpy(dest, src, min(dstlen, srclen)); + memcpy(dest, src, MY_MIN(dstlen, srclen)); if (dstlen > srclen) bfill(dest + srclen, dstlen - srclen, ' '); return dstlen; |