diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:37:55 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:37:55 -0200 |
| commit | e1cba38b6cfc4f5bb559ea211f72221e19487940 (patch) | |
| tree | 76b09d7edf85da1c50409196dcb9234b31bbbe05 /include | |
| parent | ece6212f89d606c6907f6f4770e150d47472db1a (diff) | |
| parent | 871930e708d6013df36a99da2abc5e9f8787113c (diff) | |
| download | mariadb-git-e1cba38b6cfc4f5bb559ea211f72221e19487940.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'include')
| -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 6557ae36c9b..77ec603464f 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -76,7 +76,7 @@ extern "C" { extern void *(*my_str_malloc)(size_t); extern void (*my_str_free)(void *); -#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) +#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER) #define strmov(A,B) __builtin_stpcpy((A),(B)) #elif defined(HAVE_STPCPY) #define strmov(A,B) stpcpy((A),(B)) |