| @@ -61,7 +61,7 @@ fi | |||||
| # Find out whether we need to care about CRLF | # Find out whether we need to care about CRLF | ||||
| case "$(uname 2>/dev/null)" in | case "$(uname 2>/dev/null)" in | ||||
| MINGW*) | |||||
| MINGW*|MSYS*) | |||||
| can_check_crlf=false | can_check_crlf=false | ||||
| ;; | ;; | ||||
| *) | *) | ||||
| @@ -1 +1 @@ | |||||
| Subproject commit fe546fe243e2f0ee0634b2dc3f56f119b0f45c2b | |||||
| Subproject commit 4ebf525785e22f3d96433cb4d070e890ef819190 | |||||
| @@ -1 +1 @@ | |||||
| Subproject commit 2e56b15a0711de9f0879dc0bd39f045d82a6f9e3 | |||||
| Subproject commit 5e9e1e8c2792293efced6998ae8e28ac46d93c03 | |||||
| @@ -98,7 +98,7 @@ ResourceCodecData* GdiPlusImageCodec::Load(std::string const &path) | |||||
| if (!bitmap) | if (!bitmap) | ||||
| { | { | ||||
| msg::error("could not load %s\n", path); | |||||
| msg::error("could not load %s\n", path.c_str()); | |||||
| return nullptr; | return nullptr; | ||||
| } | } | ||||
| @@ -108,7 +108,7 @@ ResourceCodecData* GdiPlusImageCodec::Load(std::string const &path) | |||||
| if (bitmap->LockBits(&rect, Gdiplus::ImageLockModeRead, | if (bitmap->LockBits(&rect, Gdiplus::ImageLockModeRead, | ||||
| PixelFormat32bppARGB, &bdata) != Gdiplus::Ok) | PixelFormat32bppARGB, &bdata) != Gdiplus::Ok) | ||||
| { | { | ||||
| msg::error("could not lock bits in %s\n", path); | |||||
| msg::error("could not lock bits in %s\n", path.c_str()); | |||||
| delete bitmap; | delete bitmap; | ||||
| return nullptr; | return nullptr; | ||||
| } | } | ||||
| @@ -1 +1 @@ | |||||
| Subproject commit 04dd8d3ce7e647704a530d169a57cd03231bdc28 | |||||
| Subproject commit f74c400f7f12c87e9a357d630de744b4c64cc4c1 | |||||
| @@ -16,9 +16,9 @@ | |||||
| #if HAVE_UNISTD_H | #if HAVE_UNISTD_H | ||||
| # include <unistd.h> | # include <unistd.h> | ||||
| #endif | |||||
| #if _WIN32 | |||||
| #elif _WIN32 | |||||
| // Only try direct.h if unistd.h is not present, because this | |||||
| // header does not exist on e.g. Cygwin/MSYS2. | |||||
| # define WIN32_LEAN_AND_MEAN | # define WIN32_LEAN_AND_MEAN | ||||
| # include <direct.h> | # include <direct.h> | ||||
| # undef WIN32_LEAN_AND_MEAN | # undef WIN32_LEAN_AND_MEAN | ||||