diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2014-02-19 14:05:15 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2014-02-19 14:05:15 +0400 |
| commit | d12c7adf715677b118104d4e5adf6f978c27b4ee (patch) | |
| tree | 04cdbaf4509cbe485cb992e271ab8d711a867011 /strings/decimal.c | |
| parent | fd1437dfe532ed78ce2a1c8e05a989fcbf79832e (diff) | |
| download | mariadb-git-d12c7adf715677b118104d4e5adf6f978c27b4ee.tar.gz | |
MDEV-5314 - Compiling fails on OSX using clang
This is port of fix for MySQL BUG#17647863.
revno: 5572
revision-id: jon.hauglid@oracle.com-20131030232243-b0pw98oy72uka2sj
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
timestamp: Thu 2013-10-31 00:22:43 +0100
message:
Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM
Rename test() macro to MY_TEST() to avoid conflict with libc++.
Diffstat (limited to 'strings/decimal.c')
| -rw-r--r-- | strings/decimal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index 6d39d9aec78..2156e095315 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -353,7 +353,7 @@ int decimal2string(const decimal_t *from, char *to, int *to_len, if (!(intg_len= fixed_precision ? fixed_intg : intg)) intg_len= 1; frac_len= fixed_precision ? fixed_decimals : frac; - len= from->sign + intg_len + test(frac) + frac_len; + len= from->sign + intg_len + MY_TEST(frac) + frac_len; if (fixed_precision) { if (frac > fixed_decimals) @@ -379,7 +379,7 @@ int decimal2string(const decimal_t *from, char *to, int *to_len, } else frac-=j; - len= from->sign + intg_len + test(frac) + frac_len; + len= from->sign + intg_len + MY_TEST(frac) + frac_len; } *to_len=len; s[len]=0; |