From 93e90c5a0452b750ac9cd6af334984ec8850530f Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 27 Jan 2022 09:27:19 -0800 Subject: [PATCH] fix 3.16 --- src/json/print.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/json/print.cpp b/src/json/print.cpp index b77760d..61b402a 100644 --- a/src/json/print.cpp +++ b/src/json/print.cpp @@ -72,7 +72,7 @@ struct args { static bool warned; if(!warned) { warned = true; - errlogPrintf("Warning: Ignoring request to print JSON5. Update Base >= 7.0.5"); + errlogPrintf("Warning: Ignoring request to print JSON5. Update Base >= 7.0.6.1"); } } #else @@ -84,7 +84,17 @@ struct args { } else { yajl_gen_config(handle, yajl_gen_beautify, 0); } +# if EPICS_VERSION_INT>=VERSION_INT(7,0,6,1) yajl_gen_config(handle, yajl_gen_json5, (int)opts.json5); +# else + if(opts.json5) { + static bool warned; + if(!warned) { + warned = true; + errlogPrintf("Warning: Ignoring request to print JSON5. Update Base >= 7.0.6.1"); + } + } +# endif yajl_gen_config(handle, yajl_gen_print_callback, stream_printer, &strm); #endif }