From 56cd7d0cd02c5fd97a0db5f7e879dc05d44c6ea4 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 19 Sep 2015 12:58:41 +0200
Subject: [PATCH] compilation failure on windows

---
 include/mysql/service_encryption.h | 2 ++
 1 file changed, 2 insertions(+)

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