Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

46dd9e86 · Davi Arnaut · b0185d2a · aaa370f5 · 46dd9e86
Commit 46dd9e86 authored Nov 17, 2010 by Davi Arnaut
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

include/m_string.h include/m_string.h +2 -2

No files found.
--- 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)
+#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4)
-#define strmov(dest, src) __builtin_stpcpy(dest, src)
+#define strmov(A,B) __builtin_stpcpy((A),(B))
 #elif defined(HAVE_STPCPY)
 #define strmov(A,B) stpcpy((A),(B))
 #ifndef stpcpy