diff options
| author | Matt Stancliff <matt@genges.com> | 2014-04-04 15:08:39 -0400 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2014-11-14 17:08:33 +0100 |
| commit | 4fdcd213f026b55baccc0a99a15564092582a90e (patch) | |
| tree | c8f0d20a7cf7a125c28a3259901279f10e5a8240 /deps/Makefile | |
| parent | e327c8edb907606765237a614ff05997b9f8b7c7 (diff) | |
| download | redis-4fdcd213f026b55baccc0a99a15564092582a90e.tar.gz | |
Lua: Upgrade cjson to 2.1.0 (2012-03-01)
The new cjson has some improvements over our current version including
increased platform compatability, a new resource limit to restrict
decode depth, and better invalid number handling.
One minor change was required to deps/Makefile because this version
of cjson doesn't export itself globally, so we added a quick little
define of -DENABLE_CJSON_GLOBAL.
cjson now has an optional higher performing float parsing interface,
but we are not including it (g_fmt.c, dtoa.c) because it requires
endianness declaration during compile time.
This commit is exactly lua_cjson.c from 2.1.0 with one minor
change of altering the two Lua includes for local search
instead of system-wide importing.
Diffstat (limited to 'deps/Makefile')
| -rw-r--r-- | deps/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/Makefile b/deps/Makefile index e183ede9c..1f623ea7b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS) LUA_CFLAGS= -D__C99FEATURES__=1 endif -LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS) +LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL $(CFLAGS) LUA_LDFLAGS+= $(LDFLAGS) # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more # challenging to cross-compile lua (and redis). These defines make it easier |