diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-05-02 13:45:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 13:45:28 -0700 |
| commit | 92898e9e9cb2f1c006fcc5099c9c96eafce63dc8 (patch) | |
| tree | e39fd97a2a5287ebc1d571b8f8ccf10b278af5a8 | |
| parent | b0403a7db85b8550e52848d7596886334e46e45f (diff) | |
| parent | 34741553718222d9d29a349e5b4d6b8b9e3529fb (diff) | |
| download | protobuf-92898e9e9cb2f1c006fcc5099c9c96eafce63dc8.tar.gz protobuf-92898e9e9cb2f1c006fcc5099c9c96eafce63dc8.tar.bz2 protobuf-92898e9e9cb2f1c006fcc5099c9c96eafce63dc8.zip | |
Merge pull request #4586 from chronoxor/master
Fix MinGW build
| -rw-r--r-- | src/google/protobuf/stubs/mathlimits.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/mathlimits.h b/src/google/protobuf/stubs/mathlimits.h index 2391ac4c..9c9d0e9a 100644 --- 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); } \ |