Commit | Line | Data |
---|---|---|
1 | diff -u -r ../jsoncpp-1.6.2/src/lib_json/json_writer.cpp ./src/lib_json/json_writer.cpp | |
2 | --- ../jsoncpp-1.6.2/src/lib_json/json_writer.cpp 2015-04-11 15:45:33.000000000 -0400 | |
3 | +++ ./src/lib_json/json_writer.cpp 2015-05-20 18:05:22.382255829 -0400 | |
4 | @@ -29,7 +29,7 @@ | |
5 | ||
6 | #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below | |
7 | #define snprintf _snprintf | |
8 | -#elif __cplusplus >= 201103L | |
9 | +#elif (__cplusplus >= 201103L) && !defined(__ANDROID__) | |
10 | #define snprintf std::snprintf | |
11 | #endif | |
12 |