Merge pull request #373 from antonindrawan/QNX_support

Compiles jsoncpp with QNX 6.6
This commit is contained in:
Christopher Dunn 2015-10-04 14:54:09 -05:00
commit beae99924f
2 changed files with 9 additions and 3 deletions

View File

@ -27,12 +27,16 @@
#else #else
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#elif defined(__ANDROID__) #elif defined(__ANDROID__) || defined(__QNXNTO__)
#define snprintf snprintf #define snprintf snprintf
#elif __cplusplus >= 201103L #elif __cplusplus >= 201103L
#define snprintf std::snprintf #define snprintf std::snprintf
#endif #endif
#if defined(__QNXNTO__)
#define sscanf std::sscanf
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
// Disable warning about strdup being deprecated. // Disable warning about strdup being deprecated.
#pragma warning(disable : 4996) #pragma warning(disable : 4996)

View File

@ -41,18 +41,20 @@
#endif #endif
#else #else
#include <cmath> #include <cmath>
#if !(defined(__QNXNTO__)) // QNX already defines isfinite
#define isfinite std::isfinite #define isfinite std::isfinite
#endif #endif
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above #if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
#define snprintf sprintf_s #define snprintf sprintf_s
#elif _MSC_VER >= 1900 // VC++ 14.0 and above #elif _MSC_VER >= 1900 // VC++ 14.0 and above
#define snprintf std::snprintf #define snprintf std::snprintf
#else #else
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#elif defined(__ANDROID__) #elif defined(__ANDROID__) || defined(__QNXNTO__)
#define snprintf snprintf #define snprintf snprintf
#elif __cplusplus >= 201103L #elif __cplusplus >= 201103L
#define snprintf std::snprintf #define snprintf std::snprintf