From 208d2bd7a82b5e978d68154fa56bc1dec5128676 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Wed, 25 Jun 2014 22:30:21 +0800 Subject: [PATCH] Separate the RAPIDJSON_FORCEINLINE from RAPIDJSON_NO_INT64DEFINE --- include/rapidjson/rapidjson.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h index 1d409f1..6939e8d 100644 --- a/include/rapidjson/rapidjson.h +++ b/include/rapidjson/rapidjson.h @@ -16,13 +16,22 @@ #ifdef _MSC_VER typedef __int64 int64_t; typedef unsigned __int64 uint64_t; -#define RAPIDJSON_FORCEINLINE __forceinline #else #include -#define RAPIDJSON_FORCEINLINE #endif #endif // RAPIDJSON_NO_INT64TYPEDEF +/////////////////////////////////////////////////////////////////////////////// +// RAPIDJSON_FORCEINLINE + +#ifndef RAPIDJSON_FORCEINLINE +#ifdef _MSC_VER +#define RAPIDJSON_FORCEINLINE __forceinline +#else +#define RAPIDJSON_FORCEINLINE +#endif +#endif // RAPIDJSON_FORCEINLINE + /////////////////////////////////////////////////////////////////////////////// // RAPIDJSON_ENDIAN #define RAPIDJSON_LITTLEENDIAN 0 //!< Little endian machine