diff options
| author | konstantin@mysql.com <> | 2005-05-05 13:47:09 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-05-05 13:47:09 +0400 |
| commit | 753959cd888535c62cc7d5a69eb9612bc6992ab6 (patch) | |
| tree | d4d95ecf06af07753385c725dd79f59678cb5ffe /include/my_sys.h | |
| parent | 25f44eab3137e10daac0d0c70ac8ada77880aa44 (diff) | |
| parent | 15dbab1c12571fe59f7ae2f5c7e7689b6f07cc17 (diff) | |
| download | mariadb-git-753959cd888535c62cc7d5a69eb9612bc6992ab6.tar.gz | |
Manual merge
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 8f595bfdbf0..f235b5a072e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -179,6 +179,10 @@ extern void my_large_free(gptr ptr, myf my_flags); #if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43) #pragma alloca #endif /* _AIX */ +#if defined(__MWERKS__) +#undef alloca +#define alloca __alloca +#endif /* __MWERKS__ */ #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca) #define alloca __builtin_alloca #endif /* GNUC */ |