diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2016-12-11 16:38:56 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-06-04 20:21:53 +0200 |
| commit | 3a24d54a98effc87a0c415d83ef774e02f3a75cc (patch) | |
| tree | 2da3cba5589a5cf4cb221ccb08bc0aa572323442 | |
| parent | 379046562d8f0c24d50168a5c9dad6a3e4c4ab91 (diff) | |
Changing parser API slightly and adding compile support to build system
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | include/dtree/dtree.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ceec91..fc96527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,10 @@ project(libdyntree) set(DYN_TREE_SRC lib/dtree.c lib/eztree.c - lib/dtree_utils.c) + lib/dtree_utils.c + + # External files compiled in + lib/jsmn.c) # Define our library in cmake add_library(libdyntree SHARED ${DYN_TREE_SRC}) diff --git a/include/dtree/dtree.h b/include/dtree/dtree.h index a315014..c0ab824 100644 --- a/include/dtree/dtree.h +++ b/include/dtree/dtree.h @@ -357,7 +357,7 @@ dt_err dtree_encode_json(dtree *data, char *json_data); * @param json_data Input json string * @return */ -dt_err dtree_decode_json(dtree *(*data), const char *json_data); +dt_err dtree_decode_json(dtree *(*data), const char *json_data, size_t len); #ifdef __cplusplus } |