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/mysql | |
| parent | e97560eac0321d43e98033f00fb0bd4f008bc9e9 (diff) | |
| parent | a55b951e6082a4ce9a1f2ed5ee176ea7dbbaf1f2 (diff) | |
| download | mariadb-git-acf46b7b36a794cd66033e61e064f16896cf7d22.tar.gz | |
Merge 10.6 into 10.8
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/service_encryption.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/mysql/service_encryption.h b/include/mysql/service_encryption.h index 69d205a27e8..280b9c69e35 100644 --- a/include/mysql/service_encryption.h +++ b/include/mysql/service_encryption.h @@ -24,22 +24,19 @@ *provider* (encryption plugin). */ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef MYSQL_ABI_CHECK +#include <my_alloca.h> #ifdef _WIN32 -#include <malloc.h> #ifndef __cplusplus #define inline __inline #endif #else #include <stdlib.h> -#ifdef HAVE_ALLOCA_H -#include <alloca.h> #endif #endif + +#ifdef __cplusplus +extern "C" { #endif /* returned from encryption_key_get_latest_version() */ |