]> granicus.if.org Git - json-c/commitdiff
Merge pull request #1 from json-c/master
authorHaffon <31226194+Haffon@users.noreply.github.com>
Tue, 29 Aug 2017 16:02:59 +0000 (00:02 +0800)
committerGitHub <noreply@github.com>
Tue, 29 Aug 2017 16:02:59 +0000 (00:02 +0800)
want to merge the original repository

1  2 
CMakeLists.txt
json_object.c

diff --cc CMakeLists.txt
index a5dc1e279cd0ddc29a48a7ee2b90dde86c80b5f1,bf6929f6b17174289f7a26ad01c9d5d5335c1413..f5958709f44ec700faf934a746f9b6803d859688
@@@ -68,8 -66,8 +68,9 @@@ set(JSON_C_SOURCE
      ./json_util.c
      ./linkhash.c
      ./printbuf.c
 +      ./strerror_override.c
      ./random_seed.c
+     ./strerror_override.c
  )
  
  add_library(json-c
diff --cc json_object.c
Simple merge