Really fix tests broken at 9778206.

core/src/fxcrt/fx_system_unittest.cpp

Index: core/src/fxcrt/fx_system_unittest.cpp
diff --git a/core/src/fxcrt/fx_system_unittest.cpp b/core/src/fxcrt/fx_system_unittest.cpp
index e1a986e72d9f04c5a574be0382150c0ca0499607..8a75e51cb861660856b065cc2b7efe2eb025558a 100644
--- a/core/src/fxcrt/fx_system_unittest.cpp
+++ b/core/src/fxcrt/fx_system_unittest.cpp
@@ -70,14 +70,12 @@ void Check64BitBase2Itoa(int64_t input, const char* expected_output) {
 
 }  // namespace
 
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+
 TEST(fxcrt, FXSYS_itoa_InvalidRadix) {
   FX_CHAR buf[32];
 
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   FXSYS_itoa(42, buf, 17);  // Ours stops at 16.
-#else
-  FXSYS_itoa(42, buf, 37);  // Theirs goes up to 36.
-#endif
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_itoa(42, buf, 1);
@@ -90,6 +88,8 @@ TEST(fxcrt, FXSYS_itoa_InvalidRadix) {
   EXPECT_EQ(std::string(""), buf);
 }
 
+#endif  // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+
 TEST(fxcrt, FXSYS_itoa) {
   Check32BitBase16Itoa(std::numeric_limits<int32_t>::min(), "-80000000");
   Check32BitBase10Itoa(std::numeric_limits<int32_t>::min(), "-2147483648");
@@ -114,15 +114,12 @@ TEST(fxcrt, FXSYS_itoa) {
                       "1111111111111111111111111111111");
 }
 
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
 
 TEST(fxcrt, FXSYS_i64toa_InvalidRadix) {
   FX_CHAR buf[32];
 
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   FXSYS_i64toa(42, buf, 17);  // Ours stops at 16.
-#else
-  FXSYS_i64toa(42, buf, 37);  // Theirs goes up to 36.
-#endif
   EXPECT_EQ(std::string(""), buf);
 
   FXSYS_i64toa(42, buf, 1);
@@ -135,6 +132,8 @@ TEST(fxcrt, FXSYS_i64toa_InvalidRadix) {
   EXPECT_EQ(std::string(""), buf);
 };
 
+#endif  // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+
 TEST(fxcrt, FXSYS_i64toa) {
   Check64BitBase16Itoa(
       std::numeric_limits<int64_t>::min(), "-8000000000000000");