diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-17 15:03:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-17 15:03:17 +0200 |
| commit | 4c355d4e81ac009abcfb94df4285d48c5229f958 (patch) | |
| tree | 51758a1ae9e98dd596befaea2b9fc84bb78dfaac /include/my_global.h | |
| parent | 090e5d8b945bb2d0dfad1193c23cdc1bd271344e (diff) | |
| parent | 7343a2ceb67e4e408e24f3b28a714e106ffe804a (diff) | |
| download | mariadb-git-4c355d4e81ac009abcfb94df4285d48c5229f958.tar.gz | |
Merge 10.11 into 11.0
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 730139be5f2..952e65c9728 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -330,13 +330,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 */ @@ -493,6 +486,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, |