Merge pull request #4586 from chronoxor/master

Fix MinGW build
7 years ago · 92898e9e9c
parent b0403a7db8 3474155371
commit 92898e9e9c
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/stubs/mathlimits.h
+++ b/src/google/protobuf/stubs/mathlimits.h
@ -243,7 +243,7 @@ DECL_UNSIGNED_INT_LIMITS(unsigned long long int)
 #endif

 // ========================================================================= //
-#ifdef WIN32  // Lacks built-in isnan() and isinf()
+#if WIN32 && !__MINGW32__ // Lacks built-in isnan() and isinf()
 #define DECL_FP_LIMIT_FUNCS \
  static bool IsFinite(const Type x) { return _finite(x); } \
  static bool IsNaN(const Type x) { return _isnan(x); } \