Merge branch 'master' into ghoshkaj_mmaperize

This commit is contained in:
Daniel Patterson
2018-10-29 09:52:50 -07:00
committed by GitHub
2 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ THE SOFTWARE.
#include <math.h>
#if defined(_MSC_VER)
#include "msinttypes/stdint.h"
#include "rapidjson/msinttypes/stdint.h"
#include <intrin.h>
#else
#include <stdint.h>