diff options
| author | Andrew Lamoureux <lwerdna@users.noreply.github.com> | 2017-03-15 20:35:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 20:35:37 -0400 |
| commit | c7c12a27abbd8a01d9425598ac7cd424dcfa50ce (patch) | |
| tree | 9347ba4e5e6a2b26baf620f59e56db7965bb47b5 /json/json-forwards.h | |
| parent | 1f7523ce2b1edac1014d781fc771d5b82568e2f1 (diff) | |
| parent | 31d34d5d067ed4c5fe071eb8637b10ed50607555 (diff) | |
Merge pull request #573 from jhurliman/dev
CMake files for building binaryninja-api and example c++ plugin
Diffstat (limited to 'json/json-forwards.h')
| -rw-r--r-- | json/json-forwards.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/json/json-forwards.h b/json/json-forwards.h index 34243899..a20d79d9 100644 --- a/json/json-forwards.h +++ b/json/json-forwards.h @@ -166,6 +166,7 @@ license you like. // In c++11 the override keyword allows you to explicity define that a function // is intended to override the base-class version. This makes the code more // managable and fixes a set of common hard-to-find bugs. + #if __cplusplus >= 201103L # define JSONCPP_OVERRIDE override # define JSONCPP_NOEXCEPT noexcept @@ -244,8 +245,10 @@ typedef unsigned int LargestUInt; typedef __int64 Int64; typedef unsigned __int64 UInt64; #else // if defined(_MSC_VER) // Other platforms, use long long + typedef int64_t Int64; typedef uint64_t UInt64; + #endif // if defined(_MSC_VER) typedef Int64 LargestInt; typedef UInt64 LargestUInt; |
