From 366e7c7e4b09096874d712696e79a913c17dd2c3 Mon Sep 17 00:00:00 2001 From: Philip Date: Fri, 21 Oct 2016 18:22:24 +0300 Subject: MS VS2015 compilation fix. It’s better to use native Win32 (strncpy_s, sprintf_s) to avoid compilation errors when building by MS C++. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/crow/json.h | 5 +++++ include/crow/query_string.h | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/crow/json.h b/include/crow/json.h index 891fedf..35f9068 100644 --- a/include/crow/json.h +++ b/include/crow/json.h @@ -1377,7 +1377,12 @@ namespace crow case type::Number: { char outbuf[128]; +#ifdef _MSC_VER + sprintf_s(outbuf, 128, "%g", v.d); +#else sprintf(outbuf, "%g", v.d); +#endif + out += outbuf; } break; diff --git a/include/crow/query_string.h b/include/crow/query_string.h index 3f8bffe..edde0f6 100644 --- a/include/crow/query_string.h +++ b/include/crow/query_string.h @@ -222,8 +222,12 @@ inline char * qs_scanvalue(const char * key, const char * qs, char * val, size_t { qs++; i = strcspn(qs, "&=#"); - strncpy(val, qs, (val_len-1)<(i+1) ? (val_len-1) : (i+1)); - qs_decode(val); +#ifdef _MSC_VER + strncpy_s(val, val_len, qs, (val_len - 1)<(i + 1) ? (val_len - 1) : (i + 1)); +#else + strncpy(val, qs, (val_len - 1)<(i + 1) ? (val_len - 1) : (i + 1)); +#endif + qs_decode(val); } else { -- cgit v1.2.3-54-g00ecf