diff options
Diffstat (limited to 'src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h')
| -rw-r--r-- | src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h b/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h index a26fff4bf..3d4477b9a 100644 --- a/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h +++ b/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h @@ -89,14 +89,14 @@ #include <limits.h> // For Visual Studio 6 in C++ mode and for many Visual Studio versions when -// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}' -// or compiler give many errors like this: +// compiling for ARM we have to wrap <wchar.h> include with 'extern "C++" {}' +// or compiler would give many errors like this: // error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#ifdef __cplusplus +#if defined(__cplusplus) && !defined(_M_ARM) extern "C" { #endif # include <wchar.h> -#ifdef __cplusplus +#if defined(__cplusplus) && !defined(_M_ARM) } #endif |