diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-30 12:25:29 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-30 12:25:29 +0200 |
| commit | 32a26332f8ad4b58e697ed360f8a67b64cdd649b (patch) | |
| tree | a5d48783316ff837e353c51a29b54f5324dd0bb1 /external/rapidjson/msinttypes/inttypes.h | |
| parent | add missing miniupnpc files, modify cmake to not build miniupnpc tests and to... (diff) | |
| download | monero-32a26332f8ad4b58e697ed360f8a67b64cdd649b.tar.xz | |
no longer need to pass the size to rapidjson
Diffstat (limited to 'external/rapidjson/msinttypes/inttypes.h')
| -rw-r--r-- | external/rapidjson/msinttypes/inttypes.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/external/rapidjson/msinttypes/inttypes.h b/external/rapidjson/msinttypes/inttypes.h index ac7e32b6e..18111286b 100644 --- a/external/rapidjson/msinttypes/inttypes.h +++ b/external/rapidjson/msinttypes/inttypes.h @@ -30,6 +30,10 @@ // /////////////////////////////////////////////////////////////////////////////// +// The above software in this distribution may have been modified by +// THL A29 Limited ("Tencent Modifications"). +// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited. + #ifndef _MSC_VER // [ #error "Use this header only with Microsoft Visual C++ compilers!" #endif // _MSC_VER ] @@ -43,6 +47,11 @@ #include "stdint.h" +// miloyip: VC supports inttypes.h since VC2013 +#if _MSC_VER >= 1800 +#include <inttypes.h> +#else + // 7.8 Format conversion of integer types typedef struct { @@ -302,5 +311,6 @@ imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) #define wcstoimax _wcstoi64 #define wcstoumax _wcstoui64 +#endif // _MSC_VER >= 1800 #endif // _MSC_INTTYPES_H_ ] |