diff options
| author | Mats Kindahl <mats.kindahl@oracle.com> | 2010-12-01 20:33:31 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats.kindahl@oracle.com> | 2010-12-01 20:33:31 +0100 |
| commit | 9c87ae9ba767edea57f7a9c6203a67f11318b772 (patch) | |
| tree | a8e5b45f2e58a83c994267cd5a4864ff20084ad3 /include | |
| parent | fc9f3efaec61ea3086c1df2942a1157fdf9ca1c2 (diff) | |
| parent | 2d81ad5be51cb2ec6921e681a6f1020e1cfa8d60 (diff) | |
| download | mariadb-git-9c87ae9ba767edea57f7a9c6203a67f11318b772.tar.gz | |
Merging patch for BUG#58246 with mysql-5.1-bugteam.
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 4 | ||||
| -rw-r--r-- | include/my_stacktrace.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/m_string.h b/include/m_string.h index 933da84c336..0d248ea0ad3 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -73,8 +73,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) && !defined(__INTEL_COMPILER) +#define strmov(A,B) __builtin_stpcpy((A),(B)) #elif defined(HAVE_STPCPY) #define strmov(A,B) stpcpy((A),(B)) #ifndef stpcpy diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index 9250fd4579e..b64d5d798a5 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -47,7 +47,7 @@ C_MODE_START #if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE) void my_init_stacktrace(); void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack); -void my_safe_print_str(const char* name, const char* val, int max_len); +void my_safe_print_str(const char* val, int max_len); void my_write_core(int sig); #if BACKTRACE_DEMANGLE char *my_demangle(const char *mangled_name, int *status); |