diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-10 09:35:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-10 09:35:50 +0200 |
| commit | f169dfb41adcb637732507ed56d3038003170a15 (patch) | |
| tree | 233560fbdc966f7674618431a8ef75375831651a /include/my_global.h | |
| parent | 25c048066a9557d1aa506220316c6fa57be5da91 (diff) | |
| parent | 08267ba0c88d2f3ba1bacee9bb9a1e4da921a60a (diff) | |
| download | mariadb-git-f169dfb41adcb637732507ed56d3038003170a15.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/my_global.h b/include/my_global.h index 2789ecc0bd0..e89249ec890 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -322,13 +322,6 @@ C_MODE_END #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA) -#undef HAVE_ALLOCA -#undef HAVE_ALLOCA_H -#endif -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif #include <errno.h> /* Recommended by debian */ /* We need the following to go around a problem with openssl on solaris */ @@ -485,6 +478,7 @@ typedef unsigned short ushort; #endif #include <my_compiler.h> +#include <my_alloca.h> /* Wen using the embedded library, users might run into link problems, |