Updated jsonlite version & amalgamate files

amamchur · Sep 11, 2014 · 8863d86 · 8863d86
1 parent 6f3e4b1
commit 8863d86
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/amalgamated/jsonlite/jsonlite.c b/amalgamated/jsonlite/jsonlite.c
@@ -15,7 +15,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License
 
-const char *jsonlite_version = "1.2.0";
+const char *jsonlite_version = "1.2.1";
 //
 //  Copyright 2012-2014, Andrii Mamchur
 //

diff --git a/amalgamated/jsonlite/jsonlite.h b/amalgamated/jsonlite/jsonlite.h
@@ -61,6 +61,9 @@ extern "C" {
     size_t jsonlite_buffer_size(jsonlite_buffer buffer);
 
     #define jsonlite_static_buffer_size() (sizeof(jsonlite_buffer_struct))
+    #define jsonlite_static_buffer_size_ext(max_token_size, chunk_size) \
+    (sizeof(jsonlite_buffer_struct) + MAX(2 * (max_token_size), (max_token_size) + (chunk_size)))
+
     jsonlite_buffer jsonlite_static_buffer_init(void *mem, size_t size);
 
     #define jsonlite_heap_buffer_size() (sizeof(jsonlite_buffer_struct))

diff --git a/jsonlite/src/jsonlite.c b/jsonlite/src/jsonlite.c
@@ -13,4 +13,4 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License
 
-const char *jsonlite_version = "1.2.0";
+const char *jsonlite_version = "1.2.1";
diff --git a/tests/JsonLiteObjCCoverageTests.m b/tests/JsonLiteObjCCoverageTests.m
@@ -508,7 +508,7 @@ - (void)testMaxLong {
 
 - (void)testVersion {
     NSString *version = [JsonLiteObjC version];
-    XCTAssertEqualObjects(version, @"1.2.0", @"Incorrect version");
+    XCTAssertEqualObjects(version, @"1.2.1", @"Incorrect version");
 }
 
 @end