diff options
author | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
commit | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (patch) | |
tree | 9c02baa18cdca6f60d80e2f7ee7f3f792c293ab9 /include/m_string.h | |
parent | 068c61978e3a81836d52b8caf11e044290159ad1 (diff) | |
download | mariadb-git-3143ad589a24ac7581e2195ba0dc13576cb3c9da.tar.gz |
Push a lot of small fixes to get larger parts to compile
Diffstat (limited to 'include/m_string.h')
-rw-r--r-- | include/m_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index 9efa0376942..e3127720df4 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -159,7 +159,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to, (DBL_DIG + 2) significant digits + sign + "." + ("e-NNN" or MAX_DECPT_FOR_F_FORMAT zeros for cases when |x|<1 and the 'f' format is used). */ -#define MY_GCVT_MAX_FIELD_WIDTH (DBL_DIG + 4 + max(5, MAX_DECPT_FOR_F_FORMAT)) \ +#define MY_GCVT_MAX_FIELD_WIDTH (DBL_DIG + 4 + MY_MAX(5, MAX_DECPT_FOR_F_FORMAT)) \ extern char *llstr(longlong value,char *buff); extern char *ullstr(longlong value,char *buff); |