gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use <wchar.h> with C++ linkage on Windows ARM

Browse Source 
Instead of commenting that we should, just do include <wchar.h>
with C++ linkage when compiling for Windows on ARM.
Actually, omitting the C linkage really should be enough here.
This commit is contained in:
Michael Haubenwallner 2015-11-27 16:46:42 +01:00
parent 28f2ed00d9
commit 5b268e6508
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/rapidjson/msinttypes/stdint.h
View File

@ -89,14 +89,14 @@
#include <limits.h> #include <limits.h>
// For Visual Studio 6 in C++ mode and for many Visual Studio versions when // 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++" {}' // compiling for ARM we have to wrap <wchar.h> include with 'extern "C++" {}'
// or compiler give many errors like this: // or compiler would give many errors like this:
// error C2733: second C linkage of overloaded function 'wmemchr' not allowed // error C2733: second C linkage of overloaded function 'wmemchr' not allowed
#ifdef __cplusplus #if defined(__cplusplus) && !defined(_M_ARM)
extern "C" { extern "C" {
#endif #endif
# include <wchar.h> # include <wchar.h>
#ifdef __cplusplus #if defined(__cplusplus) && !defined(_M_ARM)
} }
#endif #endif