Skip to content

Commit

Permalink
Updated amalgameted files
Browse files Browse the repository at this point in the history
  • Loading branch information
amamchur committed Dec 17, 2013
1 parent 05eac0a commit 27ff502
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
16 changes: 16 additions & 0 deletions amalgamated/jsonlite/jsonlite.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions jsonlite/src/jsonlite.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
1 change: 1 addition & 0 deletions tools/src.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 27ff502

Please sign in to comment.