diff --git a/CMakeLists.txt b/CMakeLists.txt index e26ebe2227..bc52b1b7a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -919,10 +919,6 @@ add_library(native STATIC ext/native/base/timeutil.h ext/native/data/compression.cpp ext/native/data/compression.h - ext/native/ext/vjson/json.cpp - ext/native/ext/vjson/json.h - ext/native/ext/vjson/block_allocator.cpp - ext/native/ext/vjson/block_allocator.h ext/native/file/chunk_file.cpp ext/native/file/chunk_file.h ext/native/file/fd_util.cpp @@ -976,6 +972,8 @@ add_library(native STATIC ext/native/input/keycodes.h ext/native/input/input_state.h ext/native/input/input_state.cpp + ext/native/json/json_writer.h + ext/native/json/json_writer.cpp ext/native/math/fast/fast_math.c ext/native/math/fast/fast_matrix.c ext/native/math/fast/fast_matrix_neon.S diff --git a/ext/native/json/json_writer.cpp b/ext/native/json/json_writer.cpp index ec43a4fae8..ea826a312c 100644 --- a/ext/native/json/json_writer.cpp +++ b/ext/native/json/json_writer.cpp @@ -1,4 +1,5 @@ #include +#include #include "json/json_writer.h" JsonWriter::JsonWriter(int flags) { @@ -49,7 +50,7 @@ const char *JsonWriter::comma() const { if (stack_.back().first) { return ""; } else { - return ",\n"; + return pretty_ ? ",\n" : ","; } }