stdint.h (rapidjson-1.0.2) | : | stdint.h (rapidjson-1.1.0) | ||
---|---|---|---|---|
skipping to change at page 257, line ? | skipping to change at page 257, line ? | |||
# define UINTMAX_C UINT64_C | # define UINTMAX_C UINT64_C | |||
#endif // UINTMAX_C ] | #endif // UINTMAX_C ] | |||
#endif // __STDC_CONSTANT_MACROS ] | #endif // __STDC_CONSTANT_MACROS ] | |||
#else // ] _MSC_VER >= 1700 [ | #else // ] _MSC_VER >= 1700 [ | |||
#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 | |||
// Define _W64 macros to mark types changing their size, like intptr_t. | // Define _W64 macros to mark types changing their size, like intptr_t. | |||
#ifndef _W64 | #ifndef _W64 | |||
# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 13 00 | # if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 13 00 | |||
# define _W64 __w64 | # define _W64 __w64 | |||
# else | # else | |||
# define _W64 | # define _W64 | |||
# endif | # endif | |||
End of changes. 3 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |