From a6294cd5cbd02c48b28fe8b380f8c259f14f9d8c Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Sat, 20 Nov 2010 12:29:51 -0200 Subject: 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... --- include/m_string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- cgit v1.2.1