Explorar el Código

Merge pull request #4586 from chronoxor/master

Fix MinGW build
Feng Xiao hace 7 años
padre
commit
92898e9e9c
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      src/google/protobuf/stubs/mathlimits.h

+ 1 - 1
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); } \