diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 22:09:25 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 22:09:25 +0300 |
| commit | e295dd2974adff13f069d01bfceee27e77882537 (patch) | |
| tree | cbf3a5e46616b11a0d5a95d543b661b383b60ebd /include | |
| parent | c530371bdcd44b0d73b987c14242e39c90c6f113 (diff) | |
| download | mariadb-git-e295dd2974adff13f069d01bfceee27e77882537.tar.gz | |
Portability fix for AIX
include/my_sys.h:
Removed redefine of alloca with GCC
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 61395114a5d..fd201d39183 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -145,22 +145,18 @@ extern my_string my_strdup(const char *from,myf MyFlags); #define CALLER_INFO /* nothing */ #define ORIG_CALLER_INFO /* nothing */ #endif + #ifdef HAVE_ALLOCA -#ifdef __GNUC__ -/* Remove any previous definitions. */ -#undef alloca -#define alloca(size) __builtin_alloca (size) -#else /* xlc */ -#ifdef _AIX - #pragma alloca +#if defined(_AIX) && !defined(__GNUC__) +#pragma alloca #endif /* _AIX */ -#endif /* __GNUC__ */ #define my_alloca(SZ) alloca((size_t) (SZ)) #define my_afree(PTR) {} #else #define my_alloca(SZ) my_malloc(SZ,MYF(0)) #define my_afree(PTR) my_free(PTR,MYF(MY_WME)) #endif /* HAVE_ALLOCA */ + #ifdef MSDOS #ifdef __ZTC__ void * __CDECL halloc(long count,size_t length); |