diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index c6813ee..c103379 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -34,6 +34,7 @@ Other Changes: +- Fixed a build issue with non-Cygwin GCC under Windows. - Examples: OpenGL3: Fixed error condition when using the GLAD loader. (#2059, #2002). [@jiri] diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index c6813ee..c103379 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -34,6 +34,7 @@ Other Changes: +- Fixed a build issue with non-Cygwin GCC under Windows. - Examples: OpenGL3: Fixed error condition when using the GLAD loader. (#2059, #2002). [@jiri] diff --git a/imgui.cpp b/imgui.cpp index 5642485..4af7604 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1506,7 +1506,7 @@ FILE* ImFileOpen(const char* filename, const char* mode) { -#if defined(_WIN32) && !defined(__CYGWIN__) +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__GNUC__) // We need a fopen() wrapper because MSVC/Windows fopen doesn't handle UTF-8 filenames. Converting both strings from UTF-8 to wchar format (using a single allocation, because we can) const int filename_wsize = ImTextCountCharsFromUtf8(filename, NULL) + 1; const int mode_wsize = ImTextCountCharsFromUtf8(mode, NULL) + 1;