Merge branch '2.4'

This commit is contained in:
Petri Lehtinen 2012-12-28 14:11:59 +02:00
commit 08c5ec8f01

View File

@ -447,7 +447,7 @@ out:
}
#if JSON_INTEGER_IS_LONG_LONG
#ifdef _MSC_VER // Microsoft Visual Studio
#ifdef _MSC_VER /* Microsoft Visual Studio */
#define json_strtoint _strtoi64
#else
#define json_strtoint strtoll