compilation failure on windows

56cd7d0c · Sergei Golubchik · 6b0b1941 · 56cd7d0c
Commit 56cd7d0c authored Sep 19, 2015 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/mysql/service_encryption.h include/mysql/service_encryption.h +2 -0

No files found.
--- 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