From 91dda1bb3c6b41d1aa142affed77758e6022d92c Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周日, 07 1月 2018 20:01:32 +0800
Subject: [PATCH] fix header consistency

---
 src/library/base/base.h     |    4 ++++
 src/library/api/datatypes.h |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/library/api/datatypes.h b/src/library/api/datatypes.h
index 4cd6126..899d4c1 100644
--- a/src/library/api/datatypes.h
+++ b/src/library/api/datatypes.h
@@ -13,8 +13,11 @@
 
 //definition of size_t
 #include <stdlib.h>
-#ifdef __unix__
+#ifndef _MSC_VER
 #include <stdbool.h>
+#endif
+
+#ifdef __unix__
 #define DllExport
 #else
 #include <windows.h>
diff --git a/src/library/base/base.h b/src/library/base/base.h
index 6623b20..6ad0bc6 100644
--- a/src/library/base/base.h
+++ b/src/library/base/base.h
@@ -18,10 +18,14 @@
 #define DllExport  __declspec( dllexport )
 
 #ifndef __cplusplus
+#ifndef _MSC_VER
+#include <stdbool.h>
+#else
 typedef int bool;
 #define false 0
 #define true -1
 #endif
+#endif
 
 #endif
 /* #define _DEBUG */

--
Gitblit v1.9.1