diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
| commit | b6981854dff11022e3de56e56cbf4633f1c49598 (patch) | |
| tree | f5b8f4ff1425f704d791d5b9af9c8af65455868d /redist/json_helpers.h | |
| parent | 94be8ccdbfb2f44c9bc569428537444030ba8eeb (diff) | |
| parent | a53c520c2d1a3bb9faa4cb5e4ee9ccc48bb1835f (diff) | |
| download | libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.gz libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.bz2 | |
Merge branch 'master' into UsbTrackerOnWin
# Conflicts:
# src/survive_vive.c
Diffstat (limited to 'redist/json_helpers.h')
| -rw-r--r-- | redist/json_helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/redist/json_helpers.h b/redist/json_helpers.h index 1670058..1cccfe3 100644 --- a/redist/json_helpers.h +++ b/redist/json_helpers.h @@ -14,7 +14,7 @@ void json_write_str(FILE* f, const char* tag, const char* v); void json_load_file(const char* path); extern void (*json_begin_object)(char* tag); extern void (*json_end_object)(); -extern void (*json_tag_value)(char* tag, char** values, uint16_t count); +extern void (*json_tag_value)(char* tag, char** values, uint8_t count); #endif
\ No newline at end of file |