diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
| commit | 0f808e11df8646e82eb3e178896dc8d88f8d79d3 (patch) | |
| tree | a09e8c27911f73e65ab2ec0ef0068d143d89a72c /ext | |
| parent | 1a65a79e57521a0d20d6a2c6d18ab8cf169fcd50 (diff) | |
| parent | ce09e363dc95d801e8707a29a0d585089d6c3d09 (diff) | |
| download | infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.tar.gz infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/json-parser/json.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json-parser/json.c b/ext/json-parser/json.c index 6012bad7..166cdcb6 100644 --- a/ext/json-parser/json.c +++ b/ext/json-parser/json.c @@ -33,6 +33,7 @@ #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS #endif + #pragma warning(disable:4996) #endif const struct _json_value json_value_none; |