aboutsummaryrefslogtreecommitdiff
path: root/redist
diff options
context:
space:
mode:
authorMichael Turvey <mwturvey@users.noreply.github.com>2017-03-16 14:14:44 -0700
committerGitHub <noreply@github.com>2017-03-16 14:14:44 -0700
commita46654cb58a1f4e1971395a4b4364e1b5a0df8d3 (patch)
tree4be87dc53f4ecb9c5c96cc9bb1c599112ca21077 /redist
parentd9412e4252c176583b5b737608acb4e60d47c00a (diff)
parent5195645bfecb4c697e3f162e1da1d51951685260 (diff)
downloadlibsurvive-a46654cb58a1f4e1971395a4b4364e1b5a0df8d3.tar.gz
libsurvive-a46654cb58a1f4e1971395a4b4364e1b5a0df8d3.tar.bz2
Merge pull request #38 from mwturvey/Fix_BSD
zao's changes for FreeBSD
Diffstat (limited to 'redist')
-rw-r--r--redist/json_helpers.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/redist/json_helpers.c b/redist/json_helpers.c
index 2413a67..7690318 100644
--- a/redist/json_helpers.c
+++ b/redist/json_helpers.c
@@ -7,7 +7,9 @@
#include <string.h>
#include "json_helpers.h"
#include <jsmn.h>
+#ifndef __FreeBSD__
#include <malloc.h>
+#endif
#ifdef _WIN32
#include <stdarg.h>