Merge pull request #4778 from Komnomnomnom/json-win-build-oops

jreback · jreback · commit 70fdc25368b0 · 2013-09-17T19:36:50.000-07:00
BLD: windows builds failing in pandas.json (#4764)
diff --git a/pandas/src/ujson/lib/ultrajsonenc.c b/pandas/src/ujson/lib/ultrajsonenc.c
@@ -549,7 +549,7 @@ int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value
   {
     precision_str[0] = '%';
     precision_str[1] = '.';
-#ifdef _WIN32
+#if defined(_WIN32) && defined(_MSC_VER)
     sprintf_s(precision_str+2, sizeof(precision_str)-2, "%ug", enc->doublePrecision);
     enc->offset += sprintf_s(str, enc->end - enc->offset, precision_str, neg ? -value : value);
 #else

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value`
`549`	`549`	`{`
`550`	`550`	`precision_str[0] = '%';`
`551`	`551`	`precision_str[1] = '.';`
`552`		`-#ifdef _WIN32`
	`552`	`+#if defined(_WIN32) && defined(_MSC_VER)`
`553`	`553`	`sprintf_s(precision_str+2, sizeof(precision_str)-2, "%ug", enc->doublePrecision);`
`554`	`554`	`enc->offset += sprintf_s(str, enc->end - enc->offset, precision_str, neg ? -value : value);`
`555`	`555`	`#else`