diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-19 12:58:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-05 17:27:13 +0200 |
| commit | 56cd7d0cd02c5fd97a0db5f7e879dc05d44c6ea4 (patch) | |
| tree | 8b91314754f7bf818752b722a8d33393692cc1ce /include/mysql | |
| parent | 6b0b1941bfa80b367eaab1f324ff18bfe8d8cb73 (diff) | |
| download | mariadb-git-56cd7d0cd02c5fd97a0db5f7e879dc05d44c6ea4.tar.gz | |
compilation failure on windows
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/service_encryption.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql/service_encryption.h b/include/mysql/service_encryption.h index eb1a6b0e629..be21af73481 100644 --- a/include/mysql/service_encryption.h +++ b/include/mysql/service_encryption.h @@ -31,7 +31,9 @@ extern "C" { #ifndef MYSQL_ABI_CHECK #ifdef _WIN32 #include <malloc.h> +#ifndef __cplusplus #define inline __inline +#endif #else #include <alloca.h> #endif |