From 27ff502157a1b9da6f44fc679ebe4c5cf2ddebaa Mon Sep 17 00:00:00 2001 From: Andrii Mamchur Date: Tue, 17 Dec 2013 05:32:31 -0500 Subject: [PATCH] Updated amalgameted files --- amalgamated/jsonlite/jsonlite.c | 16 ++++++++++++++++ jsonlite/src/jsonlite.c | 2 -- tools/src.json | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/amalgamated/jsonlite/jsonlite.c b/amalgamated/jsonlite/jsonlite.c index c97f86f..92a440b 100644 --- a/amalgamated/jsonlite/jsonlite.c +++ b/amalgamated/jsonlite/jsonlite.c @@ -15,6 +15,22 @@ // See the License for the specific language governing permissions and // limitations under the License +const char *jsonlite_version = "1.1.1"; +// +// Copyright 2012-2013, Andrii Mamchur +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License + #ifndef JSONLITE_AMALGAMATED #include "../include/jsonlite_builder.h" #endif diff --git a/jsonlite/src/jsonlite.c b/jsonlite/src/jsonlite.c index f141eba..b98361e 100644 --- a/jsonlite/src/jsonlite.c +++ b/jsonlite/src/jsonlite.c @@ -13,6 +13,4 @@ // See the License for the specific language governing permissions and // limitations under the License -#include "jsonlite.h" - const char *jsonlite_version = "1.1.1"; diff --git a/tools/src.json b/tools/src.json index e08dea9..b8b2ab4 100644 --- a/tools/src.json +++ b/tools/src.json @@ -2,6 +2,7 @@ "project": "jsonlite.c", "target": "../amalgamated/jsonlite/jsonlite.c", "sources": [ + "../jsonlite/src/jsonlite.c", "../jsonlite/src/jsonlite_builder.c", "../jsonlite/src/jsonlite_parser.c", "../jsonlite/src/jsonlite_stream.c",