diff options
| author | Daniel Black <daniel@mariadb.org> | 2023-03-24 13:04:05 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-04-13 21:47:56 +0800 |
| commit | 2e1c532bd2d9f9a35559e54f66d33c81e33009b1 (patch) | |
| tree | d011bc418ec64c19f7a40d194f56e9878093e483 | |
| parent | d1a4315f4cb096c2fd81c96bc4afc6bb618bae49 (diff) | |
| download | mariadb-git-2e1c532bd2d9f9a35559e54f66d33c81e33009b1.tar.gz | |
alloca() fix
Corrections from 1e58b8afc086da755cf9209ed17fc36351da5563.
* Re-add #pragma alloca for AIX - now in my_alloca.h
| -rw-r--r-- | include/my_alloca.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_alloca.h b/include/my_alloca.h index 25fd8867e69..de5f32bb886 100644 --- a/include/my_alloca.h +++ b/include/my_alloca.h @@ -34,7 +34,10 @@ #endif #endif -#if defined(HAVE_ALLOCA) +#if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43) +#pragma alloca +#endif /* _AIX */ + /* If the GCC/LLVM compiler from the MinGW is used, alloca may not be defined when using the MSVC CRT: @@ -42,6 +45,5 @@ #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && !defined(alloca) #define alloca __builtin_alloca #endif /* GNUC */ -#endif #endif /* MY_ALLOCA_INCLUDED */ |