Skip to content

Commit beae999

Browse files
committed
Merge pull request open-source-parsers#373 from antonindrawan/QNX_support
Compiles jsoncpp with QNX 6.6
2 parents 8b9940f + e375b8c commit beae999

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/lib_json/json_reader.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@
2727
#else
2828
#define snprintf _snprintf
2929
#endif
30-
#elif defined(__ANDROID__)
30+
#elif defined(__ANDROID__) || defined(__QNXNTO__)
3131
#define snprintf snprintf
3232
#elif __cplusplus >= 201103L
3333
#define snprintf std::snprintf
3434
#endif
3535

36+
#if defined(__QNXNTO__)
37+
#define sscanf std::sscanf
38+
#endif
39+
3640
#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
3741
// Disable warning about strdup being deprecated.
3842
#pragma warning(disable : 4996)

src/lib_json/json_writer.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,20 @@
4141
#endif
4242
#else
4343
#include <cmath>
44+
#if !(defined(__QNXNTO__)) // QNX already defines isfinite
4445
#define isfinite std::isfinite
4546
#endif
47+
#endif
4648

4749
#if defined(_MSC_VER)
48-
#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
50+
#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
4951
#define snprintf sprintf_s
5052
#elif _MSC_VER >= 1900 // VC++ 14.0 and above
5153
#define snprintf std::snprintf
5254
#else
5355
#define snprintf _snprintf
5456
#endif
55-
#elif defined(__ANDROID__)
57+
#elif defined(__ANDROID__) || defined(__QNXNTO__)
5658
#define snprintf snprintf
5759
#elif __cplusplus >= 201103L
5860
#define snprintf std::snprintf

0 commit comments

Comments
 (0)