diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:29:51 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:29:51 -0200 |
| commit | a6294cd5cbd02c48b28fe8b380f8c259f14f9d8c (patch) | |
| tree | aa51b0c6c39a99a310298b4de35d0b1c918a5861 /include | |
| parent | 05c9acaaf76c83a1ebfb9e4ab66b132377357282 (diff) | |
| download | mariadb-git-a6294cd5cbd02c48b28fe8b380f8c259f14f9d8c.tar.gz | |
Bug#57994: Compiler flag change build error : my_redel.c
Although ICC identifies itself as GCC, even in version numbers,
it does not support the stpcpy built-in.
include/m_string.h:
Work around ICC. Hacks...
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 c963e605501..0d248ea0ad3 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -73,7 +73,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)) |