diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 18:11:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 18:11:37 +0200 |
| commit | acf46b7b36a794cd66033e61e064f16896cf7d22 (patch) | |
| tree | c648d7f39b367d7825ea7169cee7bf54d2be1f86 /include/my_global.h | |
| parent | e97560eac0321d43e98033f00fb0bd4f008bc9e9 (diff) | |
| parent | a55b951e6082a4ce9a1f2ed5ee176ea7dbbaf1f2 (diff) | |
| download | mariadb-git-acf46b7b36a794cd66033e61e064f16896cf7d22.tar.gz | |
Merge 10.6 into 10.8
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 89a3789b788..962f7396008 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, |