summaryrefslogtreecommitdiff
path: root/wiretap/json.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2016-09-28 12:01:33 +0200
committerPeter Wu <peter@lekensteyn.nl>2016-09-30 20:12:00 +0000
commit11c10244ef5168a337d88611d61c5ebc88acd29e (patch)
treec1503548a6ae38cb372632d14169a880cc5ae95d /wiretap/json.c
parent534787e402d6aa8b349638f911a2a65b013c6594 (diff)
downloadwireshark-11c10244ef5168a337d88611d61c5ebc88acd29e.tar.gz
wsutil: split libjsmn.
The libjsmn was imported into the tree and enhanced with a new function. This change splits it into the "original" libjsmn and an addictional module wsjsmn that contains the new function. This will make easier to port within the tree future versions of the library. Change-Id: I3f1caa91bee462e0767e5e18d0b6a10f0b1cad32 Reviewed-on: https://code.wireshark.org/review/17963 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'wiretap/json.c')
-rw-r--r--wiretap/json.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/json.c b/wiretap/json.c
index 4842ee19d2..5c3c1bd243 100644
--- a/wiretap/json.c
+++ b/wiretap/json.c
@@ -25,7 +25,7 @@
#include "file_wrappers.h"
#include "json.h"
-#include <wsutil/jsmn.h>
+#include <wsutil/wsjsmn.h>
static gboolean json_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
Buffer *buf, int *err, gchar **err_info)