diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-17 07:50:19 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-17 07:50:19 -0200 |
| commit | cd9bee8da292b0b493ec4cdb61d818caa280a094 (patch) | |
| tree | 6048a7af5eb23d46d42481aa5a7dcec42ecc26da /include | |
| parent | 9aa70e5188e63db3b7b450b8f0161ae442398468 (diff) | |
| parent | c324624291a8c7cfbfcc728ce9fa86feb8d4e904 (diff) | |
| download | mariadb-git-cd9bee8da292b0b493ec4cdb61d818caa280a094.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h index bfe632e192d..6557ae36c9b 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -76,8 +76,8 @@ extern "C" { extern void *(*my_str_malloc)(size_t); extern void (*my_str_free)(void *); -#if MY_GNUC_PREREQ(3, 4) -#define strmov(dest, src) __builtin_stpcpy(dest, src) +#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) +#define strmov(A,B) __builtin_stpcpy((A),(B)) #elif defined(HAVE_STPCPY) #define strmov(A,B) stpcpy((A),(B)) #ifndef stpcpy |