MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'suokko/jsoncpp_int64' into develop

develop
lethosor 2018-06-14 14:13:28 -04:00
parent d35b6d468c 424028a0ae
commit 1743ad70ab
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
depends/jsoncpp/jsoncpp.h
Unescape Escape View File

@ -195,6 +195,8 @@ license you like.
#define JSONCPP_DEPRECATED(message) #define JSONCPP_DEPRECATED(message)
#endif // if !defined(JSONCPP_DEPRECATED) #endif // if !defined(JSONCPP_DEPRECATED)
#include <cstdint>
namespace Json { namespace Json {
typedef int Int; typedef int Int;
typedef unsigned int UInt; typedef unsigned int UInt;
@ -208,8 +210,8 @@ typedef unsigned int LargestUInt;
typedef __int64 Int64; typedef __int64 Int64;
typedef unsigned __int64 UInt64; typedef unsigned __int64 UInt64;
#else // if defined(_MSC_VER) // Other platforms, use long long #else // if defined(_MSC_VER) // Other platforms, use long long
typedef long long int Int64; typedef int64_t Int64;
typedef unsigned long long int UInt64; typedef uint64_t UInt64;
#endif // if defined(_MSC_VER) #endif // if defined(_MSC_VER)
typedef Int64 LargestInt; typedef Int64 LargestInt;
typedef UInt64 LargestUInt; typedef UInt64 LargestUInt;