diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-11-27 00:25:16 -0800 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-11-27 00:25:16 -0800 |
| commit | 93c3ab46494f35c390b40220519d83634e4e347f (patch) | |
| tree | 68616e5f1c2a5175e4a27645761e891429364ed5 /src | |
| parent | 4b8da65be9f5adb340d7edf32362bdb24f20833b (diff) | |
| parent | 10c9206de2ae4079ca1239ff44cee3fdb1deadf5 (diff) | |
Merge branch 'master' into compact
Diffstat (limited to 'src')
| -rw-r--r-- | src/pugixml.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 16a012e..52ddf4c 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -4548,7 +4548,7 @@ PUGI__NS_BEGIN _fseeki64(file, 0, SEEK_END); length_type length = _ftelli64(file); _fseeki64(file, 0, SEEK_SET); - #elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && !defined(__STRICT_ANSI__) + #elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && !(defined(__STRICT_ANSI__) && __GNUC__ * 100 + __GNUC_MINOR__ <= 405) // there are 64-bit versions of fseek/ftell, let's use them typedef off64_t length_type; @@ -4793,7 +4793,7 @@ PUGI__NS_BEGIN } #endif -#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && !defined(__STRICT_ANSI__)) +#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && !(defined(__STRICT_ANSI__) && __GNUC__ * 100 + __GNUC_MINOR__ <= 405)) PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode) { return _wfopen(path, mode); |